ekiga r7331 - in trunk: . lib/engine/gui/gtk-frontend lib/gui src/gui

From: sfre svn gnome org
To: svn-commits-list gnome org
Subject: ekiga r7331 - in trunk: . lib/engine/gui/gtk-frontend lib/gui src/gui
Date: Tue, 11 Nov 2008 22:02:41 +0000 (UTC)
Author: sfre
Date: Tue Nov 11 22:02:41 2008
New Revision: 7331
URL: http://svn.gnome.org/viewvc/ekiga?rev=7331&view=rev

Log:
Get rid of the now-deprecated GtkSignalFunc.

Let's just use GCallback instead.

Now Ekiga compiles with
  make CFLAGS+="-DGDK_PIXBUF_DISABLE_DEPRECATED
                -DGDK_DISABLE_DEPRECATED
                -DGTK_DISABLE_DEPRECATED"

Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
   trunk/lib/gui/gmdialog.c
   trunk/lib/gui/gmmenuaddon.c
   trunk/lib/gui/gmmenuaddon.h
   trunk/src/gui/accounts.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/preferences.cpp
   trunk/src/gui/statusicon.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Tue Nov 11 22:02:41 2008
@@ -240,7 +240,7 @@
   item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, self->priv->accel);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu_builder.menu), item);
   g_signal_connect_swapped (G_OBJECT (item), "activate",
-                            GTK_SIGNAL_FUNC (gtk_widget_hide),
+                            G_CALLBACK (gtk_widget_hide),
                             (gpointer) self);
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (self->priv->menu_item_core),
@@ -405,7 +405,7 @@
                             NULL, NULL, NULL, NULL,
                             event->button, event->time);
             g_signal_connect (G_OBJECT (menu_builder.menu), "hide",
-                              GTK_SIGNAL_FUNC (g_object_unref),
+                              G_CALLBACK (g_object_unref),
                               (gpointer) menu_builder.menu);
           }
           g_object_ref_sink (G_OBJECT (menu_builder.menu));

Modified: trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	Tue Nov 11 22:02:41 2008
@@ -362,7 +362,7 @@
 	    gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
 			    NULL, NULL, event->button, event->time);
 	    g_signal_connect (G_OBJECT (builder.menu), "hide",
-			      GTK_SIGNAL_FUNC (g_object_unref),
+			      G_CALLBACK (g_object_unref),
 			      (gpointer) builder.menu);
 	  }
 	  g_object_ref_sink (G_OBJECT (builder.menu));

Modified: trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	Tue Nov 11 22:02:41 2008
@@ -164,7 +164,7 @@
 	gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
 			NULL, NULL, event->button, event->time);
 	g_signal_connect (G_OBJECT (builder.menu), "hide",
-			  GTK_SIGNAL_FUNC (g_object_unref),
+			  G_CALLBACK (g_object_unref),
 			  (gpointer) builder.menu);
 	g_object_ref_sink (G_OBJECT (builder.menu));
       }

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Tue Nov 11 22:02:41 2008
@@ -403,7 +403,7 @@
     gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
 		    NULL, NULL, event->button, event->time);
     g_signal_connect (G_OBJECT (builder.menu), "hide",
-		      GTK_SIGNAL_FUNC (g_object_unref),
+		      G_CALLBACK (g_object_unref),
 		      (gpointer) builder.menu);
   }
   g_object_ref_sink (G_OBJECT (builder.menu));
@@ -422,7 +422,7 @@
     gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
 		    NULL, NULL, event->button, event->time);
     g_signal_connect (G_OBJECT (builder.menu), "hide",
-		      GTK_SIGNAL_FUNC (g_object_unref),
+		      G_CALLBACK (g_object_unref),
 		      (gpointer) builder.menu);
   }
   g_object_ref_sink (G_OBJECT (builder.menu));
@@ -450,7 +450,7 @@
     gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
 		    NULL, NULL, event->button, event->time);
     g_signal_connect (G_OBJECT (builder.menu), "hide",
-		      GTK_SIGNAL_FUNC (g_object_unref),
+		      G_CALLBACK (g_object_unref),
 		      (gpointer) builder.menu);
   }
   g_object_ref_sink (G_OBJECT (builder.menu));

Modified: trunk/lib/gui/gmdialog.c
==============================================================================
--- trunk/lib/gui/gmdialog.c	(original)
+++ trunk/lib/gui/gmdialog.c	Tue Nov 11 22:02:41 2008
@@ -507,7 +507,7 @@
   gnomemeeting_threads_dialog_show_all (dialog);
 
   g_signal_connect_data (GTK_OBJECT (dialog), "response",
-			 GTK_SIGNAL_FUNC (warning_dialog_destroyed_cb),
+			 G_CALLBACK (warning_dialog_destroyed_cb),
 			 (gpointer) g_strdup (key),
 			 (GClosureNotify) g_free,
 			 (GConnectFlags) 0);

Modified: trunk/lib/gui/gmmenuaddon.c
==============================================================================
--- trunk/lib/gui/gmmenuaddon.c	(original)
+++ trunk/lib/gui/gmmenuaddon.c	Tue Nov 11 22:02:41 2008
@@ -391,10 +391,10 @@
       g_object_set_data (G_OBJECT (menu [i].widget),
 			 "statusbar", statusbar);
       g_signal_connect (G_OBJECT (menu [i].widget),
-			"select", GTK_SIGNAL_FUNC (menu_item_selected), 
+			"select", G_CALLBACK (menu_item_selected), 
 			(gpointer) menu [i].tooltip);
       g_signal_connect (G_OBJECT (menu [i].widget),
-			"deselect", GTK_SIGNAL_FUNC (menu_item_selected), 
+			"deselect", G_CALLBACK (menu_item_selected), 
 			NULL);
     }
     g_free (menu_name);

Modified: trunk/lib/gui/gmmenuaddon.h
==============================================================================
--- trunk/lib/gui/gmmenuaddon.h	(original)
+++ trunk/lib/gui/gmmenuaddon.h	Tue Nov 11 22:02:41 2008
@@ -70,7 +70,7 @@
   gboolean stock_is_theme;
   guint accel;
   MenuEntryType type;
-  GtkSignalFunc func;
+  GCallback func;
   GClosureNotify clofunc;
   gpointer data;
   GtkWidget *widget;

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Tue Nov 11 22:02:41 2008
@@ -326,7 +326,7 @@
   item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, aw->accel);
   gtk_menu_shell_append (GTK_MENU_SHELL (builder.menu), item);
   g_signal_connect_swapped (G_OBJECT (item), "activate",
-                            GTK_SIGNAL_FUNC (gtk_widget_hide),
+                            G_CALLBACK (gtk_widget_hide),
                             (gpointer) window);
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (aw->menu_item_core),
@@ -380,7 +380,7 @@
             gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
                             NULL, NULL, event->button, event->time);
             g_signal_connect (G_OBJECT (builder.menu), "hide",
-                              GTK_SIGNAL_FUNC (g_object_unref),
+                              G_CALLBACK (g_object_unref),
                               (gpointer) builder.menu);
           }
           g_object_ref_sink (G_OBJECT (builder.menu));

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Tue Nov 11 22:02:41 2008
@@ -1771,10 +1771,10 @@
 		    G_CALLBACK (delete_window_cb), NULL);
 
   g_signal_connect (G_OBJECT (window), "show", 
-                    GTK_SIGNAL_FUNC (audio_volume_window_shown_cb), mw);
+                    G_CALLBACK (audio_volume_window_shown_cb), mw);
 
   g_signal_connect (G_OBJECT (window), "hide", 
-                    GTK_SIGNAL_FUNC (audio_volume_window_hidden_cb), mw);
+                    G_CALLBACK (audio_volume_window_hidden_cb), mw);
 
   return window;
 }
@@ -2681,7 +2681,7 @@
   g_signal_connect (G_OBJECT (incoming_call_popup), "delete_event",
                     G_CALLBACK (gtk_widget_hide_on_delete), NULL);
   g_signal_connect (G_OBJECT (incoming_call_popup), "response",
-                    GTK_SIGNAL_FUNC (incoming_call_response_cb), &call);
+                    G_CALLBACK (incoming_call_response_cb), &call);
 
   call->cleared.connect (sigc::bind (sigc::ptr_fun (on_cleared_incoming_call_cb),
                                     (gpointer) incoming_call_popup));
@@ -3017,7 +3017,7 @@
 //  g_signal_connect (G_OBJECT (add_device_popup), "delete_event",
 //                    G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 //  g_signal_connect (G_OBJECT (add_device_popup), "response",
-//                    GTK_SIGNAL_FUNC (add_device_response_cb), &device);
+//                    G_CALLBACK (add_device_response_cb), &device);
 
   deviceStruct* device_struct = g_new(deviceStruct, 1);
   snprintf (device_struct->name, sizeof (device_struct->name), "%s", (device.GetString()).c_str());
@@ -3696,7 +3696,7 @@
   gtk_widget_show_all (mw->priv->statusbar_ebox);
 
   g_signal_connect (G_OBJECT (mw->priv->statusbar_ebox), "button-press-event",
-		    GTK_SIGNAL_FUNC (statusbar_clicked_cb), mw);
+		    G_CALLBACK (statusbar_clicked_cb), mw);
  
   g_signal_connect (mw, "notify::style",
                     G_CALLBACK (ekiga_main_window_style_notify), NULL);

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Tue Nov 11 22:02:41 2008
@@ -117,7 +117,7 @@
 					   GtkWidget *box,
 					   const char *stock_id,
 					   const char *label,
-					   GtkSignalFunc func,
+					   GCallback func,
 					   gchar *tooltip,
 					   gfloat valign,
 					   gpointer data);
@@ -327,7 +327,7 @@
                          GtkWidget *box,
                          const char *stock_id,
                          const char *label,
-                         GtkSignalFunc func,
+                         GCallback func,
                          G_GNUC_UNUSED gchar *tooltip,
                          gfloat valign,
                          gpointer data)
@@ -709,7 +709,7 @@
 
 
   /* That button will refresh the device list */
-  gm_pw_add_update_button (prefs_window, container, GTK_STOCK_REFRESH, _("_Detect devices"), GTK_SIGNAL_FUNC (refresh_devices_list_cb), _("Click here to refresh the device list."), 1, prefs_window);
+  gm_pw_add_update_button (prefs_window, container, GTK_STOCK_REFRESH, _("_Detect devices"), G_CALLBACK (refresh_devices_list_cb), _("Click here to refresh the device list."), 1, prefs_window);
 }
 
 
@@ -920,7 +920,7 @@
                           (gpointer) VIDEO_DEVICES_KEY "image");
   */
   /* That button will refresh the device list */
-  gm_pw_add_update_button (prefs_window, container, GTK_STOCK_REFRESH, _("_Detect devices"), GTK_SIGNAL_FUNC (refresh_devices_list_cb), _("Click here to refresh the device list."), 1, prefs_window);
+  gm_pw_add_update_button (prefs_window, container, GTK_STOCK_REFRESH, _("_Detect devices"), G_CALLBACK (refresh_devices_list_cb), _("Click here to refresh the device list."), 1, prefs_window);
 
   for (i=0; i< NB_VIDEO_SIZES; i++) {
 

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Tue Nov 11 22:02:41 2008
@@ -392,19 +392,19 @@
       GTK_MENU_ENTRY("help", NULL,
                      _("Get help by reading the Ekiga manual"),
                      GTK_STOCK_HELP, GDK_F1,
-                     GTK_SIGNAL_FUNC (help_cb), NULL, TRUE),
+                     G_CALLBACK (help_cb), NULL, TRUE),
 
       GTK_MENU_ENTRY("about", NULL,
 		     _("View information about Ekiga"),
 		     GTK_STOCK_ABOUT, 0,
-		     GTK_SIGNAL_FUNC (about_callback), (gpointer) main_window,
+		     G_CALLBACK (about_callback), (gpointer) main_window,
 		     TRUE),
 
       GTK_MENU_SEPARATOR,
 
       GTK_MENU_ENTRY("quit", NULL, _("Quit"),
 		     GTK_STOCK_QUIT, 'Q',
-		     GTK_SIGNAL_FUNC (quit_callback),
+		     G_CALLBACK (quit_callback),
 		     main_window, TRUE),
 
       GTK_MENU_END
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]