[ekiga] Renamed help_cb to help_callback for api coherence

[Julien Puydt <jpuydt src gnome org>]

commit f7dd59c99343b1fe065b40f2d4ffaa2fc38e2e4c
Author: Snark <jpuydt gnome org>
Date:   Tue Nov 2 11:30:22 2010 +0100

    Renamed help_cb to help_callback for api coherence

 src/gui/accounts.cpp    |    2 +-
 src/gui/callbacks.cpp   |    4 ++--
 src/gui/callbacks.h     |    4 ++--
 src/gui/main_window.cpp |    2 +-
 src/gui/statusicon.cpp  |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/gui/accounts.cpp b/src/gui/accounts.cpp
index f68dddf..91366f9 100644
--- a/src/gui/accounts.cpp
+++ b/src/gui/accounts.cpp
@@ -599,7 +599,7 @@ gm_accounts_window_new (Ekiga::ServiceCore &core)
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu);
   item = gtk_image_menu_item_new_from_stock (GTK_STOCK_HELP, NULL);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (help_cb), NULL);
+  g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (help_callback), NULL);
 
   /* The accounts list store */
   list_store = gtk_list_store_new (COLUMN_ACCOUNT_NUMBER,
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 773d271..65e4f9f 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -163,8 +163,8 @@ GNU GPL for all the rest of the software thus combined.")
 
 
 void
-help_cb (G_GNUC_UNUSED GtkWidget *widget,
-	 G_GNUC_UNUSED gpointer data)
+help_callback (G_GNUC_UNUSED GtkWidget *widget,
+	       G_GNUC_UNUSED gpointer data)
 {
 #ifdef WIN32
   gchar *locale, *loc_ , *index_path;
diff --git a/src/gui/callbacks.h b/src/gui/callbacks.h
index b26d1c1..271f97f 100644
--- a/src/gui/callbacks.h
+++ b/src/gui/callbacks.h
@@ -56,8 +56,8 @@ void about_callback (GtkWidget *widget,
  * BEHAVIOR     :  Open the help window.
  * PRE          :  /
  */
-void help_cb (GtkWidget *widget,
-              gpointer data);
+void help_callback (GtkWidget *widget,
+		    gpointer data);
 
 
 /* DESCRIPTION  :  This callback is called when the user chooses to quit.
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 1b4c5f2..d5b1467 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -3317,7 +3317,7 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
       GTK_MENU_ENTRY("help", NULL, 
                      _("Get help by reading the Ekiga manual"),
                      GTK_STOCK_HELP, GDK_F1, 
-                     G_CALLBACK (help_cb), NULL, TRUE),
+                     G_CALLBACK (help_callback), NULL, TRUE),
 
       GTK_MENU_ENTRY("about", NULL,
 		     _("View information about Ekiga"),
diff --git a/src/gui/statusicon.cpp b/src/gui/statusicon.cpp
index fe0b370..4cf28b6 100644
--- a/src/gui/statusicon.cpp
+++ b/src/gui/statusicon.cpp
@@ -452,7 +452,7 @@ statusicon_build_menu (Ekiga::ServiceCore& services)
       GTK_MENU_ENTRY("help", NULL,
                      _("Get help by reading the Ekiga manual"),
                      GTK_STOCK_HELP, GDK_F1,
-                     G_CALLBACK (help_cb), NULL, TRUE),
+                     G_CALLBACK (help_callback), NULL, TRUE),
 
       GTK_MENU_ENTRY("about", NULL,
 		     _("View information about Ekiga"),