[ekiga] Got rid of two callbacks

[Julien Puydt <jpuydt src gnome org>]

commit f11350f50b89ce58cad79c3243fdad2277550ff3
Author: Julien Puydt <jpuydt gnome org>
Date:   Tue Oct 13 21:26:58 2009 +0200

    Got rid of two callbacks
    
    I don't get why the main callback wasn't used

 src/gui/callbacks.cpp |   17 -----------------
 src/gui/callbacks.h   |    6 ------
 src/gui/main.cpp      |   12 ++++++++----
 3 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 26d39d3..336b620 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -96,23 +96,6 @@ show_window_cb (G_GNUC_UNUSED GtkWidget *widget,
 
 
 void
-show_assistant_window_cb (G_GNUC_UNUSED GtkWidget *widget,
-                          G_GNUC_UNUSED gpointer data)
-{
-  GtkWidget *window = GnomeMeeting::Process ()->GetAssistantWindow ();
-  show_window (window);
-}
-
-void
-show_prefs_window_cb (G_GNUC_UNUSED GtkWidget *widget,
-                      G_GNUC_UNUSED gpointer data)
-{
-  GtkWidget *window = GnomeMeeting::Process ()->GetPrefsWindow ();
-  show_window (window);
-}
-
-
-void
 hide_window_cb (G_GNUC_UNUSED GtkWidget *widget,
 		gpointer data)
 {
diff --git a/src/gui/callbacks.h b/src/gui/callbacks.h
index 7f43190..6ddc768 100644
--- a/src/gui/callbacks.h
+++ b/src/gui/callbacks.h
@@ -61,12 +61,6 @@ gboolean delete_window_cb (GtkWidget *widget,
 void show_window_cb (GtkWidget *widget,
 		     gpointer data);
 
-void show_assistant_window_cb (GtkWidget *widget,
-                               gpointer   data);
-
-void show_prefs_window_cb (GtkWidget *widget,
-			   gpointer   data);
-
 /* DESCRIPTION  :  Simple wrapper that will call gnomemeeting_window_hide.
  * BEHAVIOR     :  Calls gnomemeeting_window_hide.
  * PRE          :  The gpointer is a valid pointer to the GtkWindow that needs
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 6da8323..684fe0c 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -3099,6 +3099,8 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
   
   GtkWidget *addressbook_window = NULL;
   GtkWidget *accounts_window = NULL;
+  GtkWidget *prefs_window = NULL;
+  GtkWidget *assistant_window = NULL;
 
   bool show_call_panel = false;
 
@@ -3111,6 +3113,8 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
   boost::shared_ptr<GtkFrontend> gtk_frontend = services->get<GtkFrontend> ("gtk-frontend");
   addressbook_window = GTK_WIDGET (gtk_frontend->get_addressbook_window ()); 
   accounts_window = GnomeMeeting::Process ()->GetAccountsWindow ();
+  prefs_window = GnomeMeeting::Process ()->GetPrefsWindow ();
+  assistant_window = GnomeMeeting::Process ()->GetAssistantWindow ();
 
   mw->priv->main_menu = gtk_menu_bar_new ();
 
@@ -3192,8 +3196,8 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
       GTK_MENU_ENTRY("configuration_assistant", _("_Configuration Assistant"),
 		     _("Run the configuration assistant"),
 		     NULL, 0, 
-		     G_CALLBACK (show_assistant_window_cb),
-		     NULL, TRUE),
+		     G_CALLBACK (show_window_cb),
+		     (gpointer) assistant_window, TRUE),
 
       GTK_MENU_SEPARATOR,
       
@@ -3206,8 +3210,8 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
       GTK_MENU_ENTRY("preferences", NULL,
 		     _("Change your preferences"), 
 		     GTK_STOCK_PREFERENCES, 0,
-		     G_CALLBACK (show_prefs_window_cb),
-		     NULL, TRUE),
+		     G_CALLBACK (show_window_cb),
+		     (gpointer) prefs_window, TRUE),
 
       GTK_MENU_NEW(_("_View")),