[ekiga] Moved show_window_cb from src/gui/callbacks.* to src/gui/main_window.cpp

[Julien Puydt <jpuydt src gnome org>]

commit cfef32be585007e209105a965fe4561b8af4239e
Author: Julien Puydt <jpuydt gnome org>
Date:   Tue Oct 20 22:38:04 2009 +0200

    Moved show_window_cb from src/gui/callbacks.* to src/gui/main_window.cpp
    
    It was the only place where it was used anyway.

 src/gui/callbacks.cpp   |    8 --------
 src/gui/callbacks.h     |   10 ----------
 src/gui/main_window.cpp |   15 +++++++++++++++
 3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/src/gui/callbacks.cpp b/src/gui/callbacks.cpp
index 5316ef1..2929d1a 100644
--- a/src/gui/callbacks.cpp
+++ b/src/gui/callbacks.cpp
@@ -78,14 +78,6 @@ delete_window_cb (GtkWidget *widget,
 }
 
 void
-show_window_cb (G_GNUC_UNUSED GtkWidget *widget,
-		gpointer data)
-{
-  gm_window_show (GTK_WIDGET (data));
-}
-
-
-void
 about_callback (G_GNUC_UNUSED GtkWidget *widget, 
 		gpointer parent_window)
 {
diff --git a/src/gui/callbacks.h b/src/gui/callbacks.h
index cae698f..3c95100 100644
--- a/src/gui/callbacks.h
+++ b/src/gui/callbacks.h
@@ -51,16 +51,6 @@ gboolean delete_window_cb (GtkWidget *widget,
                            GdkEvent *event,
                            gpointer data);
 
-
-/* DESCRIPTION  :  Simple wrapper that will call gnomemeeting_show_window.
- * BEHAVIOR     :  Calls gnomemeeting_window_show or present the window if
- * 		   it was already shown.
- * PRE          :  The gpointer is a valid pointer to the GtkWindow that needs
- *                 to be shown with the correct size and position.
- */
-void show_window_cb (GtkWidget *widget,
-		     gpointer data);
-
 /* DESCRIPTION  :  This callback is called when the user chooses to open
  *                 the about window.
  * BEHAVIOR     :  Open the about window.
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index dacdc33..651d5b7 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -216,6 +216,12 @@ enum {
 
 /* GUI Functions */
 
+/* DESCRIPTION  : /
+ * BEHAVIOR     : Shows a window
+ * PRE          : The given data pointer should be a window
+ */
+static void show_window_cb (GtkWidget *widget,
+			    gpointer data);
 
 /* DESCRIPTION  : /
  * BEHAVIOR     : Builds the video settings popup of the main window.
@@ -516,6 +522,15 @@ static const std::string ekiga_main_window_get_call_url (EkigaMainWindow *mw);
 /* 
  * Engine Callbacks 
  */
+
+static void
+show_window_cb (G_GNUC_UNUSED GtkWidget *widget,
+		gpointer data)
+{
+  gm_window_show (GTK_WIDGET (data));
+}
+
+
 static void
 on_account_updated (Ekiga::BankPtr /*bank*/,
 		    Ekiga::AccountPtr account,