ekiga r7018 - in trunk: . lib/gui src/gui

[jschamp svn gnome org]

Author: jschamp
Date: Thu Sep 18 23:17:10 2008
New Revision: 7018
URL: http://svn.gnome.org/viewvc/ekiga?rev=7018&view=rev

Log:
Fixed double-setting of the main window title, changed internal GmWindow signal handlers to to propagate the delete-event further (should fix #552802)

Modified:
   trunk/ChangeLog
   trunk/lib/gui/gmwindow.c
   trunk/src/gui/main.cpp

Modified: trunk/lib/gui/gmwindow.c
==============================================================================
--- trunk/lib/gui/gmwindow.c	(original)
+++ trunk/lib/gui/gmwindow.c	Thu Sep 18 23:17:10 2008
@@ -63,6 +63,9 @@
 
 static GObjectClass *parent_class = NULL;
 
+static gboolean
+gm_window_delete_event (GtkWidget *w,
+			gpointer data);
 
 static void
 gm_window_show (GtkWidget *w,
@@ -213,7 +216,7 @@
                            g_cclosure_new_swap (G_CALLBACK (gtk_widget_hide), (gpointer) self, NULL));
 
   g_signal_connect (G_OBJECT (self), "delete_event",
-		    G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+		    G_CALLBACK (gm_window_delete_event), NULL);
 
   g_signal_connect (G_OBJECT (self), "show",
                     G_CALLBACK (gm_window_show), self);
@@ -259,6 +262,15 @@
  * Our own stuff
  */
 
+static gboolean
+gm_window_delete_event (GtkWidget *w,
+                        G_GNUC_UNUSED gpointer data)
+{
+  gtk_widget_hide (w);
+  return FALSE;
+}
+
+
 static void
 gm_window_show (GtkWidget *w,
                 G_GNUC_UNUSED gpointer data)

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Sep 18 23:17:10 2008
@@ -2834,11 +2834,11 @@
 
   if (!gtk_status_icon_is_embedded (GTK_STATUS_ICON (statusicon)))
     quit_callback (NULL, data);
-  else 
+  else
     gtk_widget_hide (GTK_WIDGET (data));
 
   return (TRUE);
-}  
+}
 
 
 static void
@@ -4121,7 +4121,6 @@
   g_signal_connect (G_OBJECT (mw->statusbar_ebox), "button-press-event",
 		    GTK_SIGNAL_FUNC (statusbar_clicked_cb), window);
  
-  gtk_window_set_title (GTK_WINDOW (window), _("Ekiga"));
   gtk_widget_realize (window);
   gm_main_window_update_logo_have_window (window);
   g_signal_connect_after (G_OBJECT (mw->main_notebook), "switch-page",