network-manager-applet r765 - in trunk: . src src/connection-editor

[chpe svn gnome org]

Author: chpe
Date: Mon Jun 23 15:29:37 2008
New Revision: 765
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=765&view=rev

Log:
	* src/connection-editor/page-wireless-security.c:
	(ce_page_wireless_security_new):
	* src/wireless-dialog.c: (connection_combo_init),
	(device_combo_init), (internal_init): Don't use deprecated gtk type
	macros. Bug #539325.

Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/page-wireless-security.c
   trunk/src/wireless-dialog.c

Modified: trunk/src/connection-editor/page-wireless-security.c
==============================================================================
--- trunk/src/connection-editor/page-wireless-security.c	(original)
+++ trunk/src/connection-editor/page-wireless-security.c	Mon Jun 23 15:29:37 2008
@@ -342,7 +342,7 @@
 
 	wireless_security_combo_changed (combo, self);
 	g_signal_connect (combo, "changed",
-	                  GTK_SIGNAL_FUNC (wireless_security_combo_changed),
+	                  G_CALLBACK (wireless_security_combo_changed),
 	                  self);
 
 	return self;

Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c	(original)
+++ trunk/src/wireless-dialog.c	Mon Jun 23 15:29:37 2008
@@ -491,7 +491,7 @@
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 	g_signal_connect (G_OBJECT (widget), "changed",
-	                  GTK_SIGNAL_FUNC (connection_combo_changed), self);
+	                  G_CALLBACK (connection_combo_changed), self);
 	if (connection || !num_added) {
 		gtk_widget_hide (glade_xml_get_widget (priv->xml, "connection_label"));
 		gtk_widget_hide (widget);
@@ -601,7 +601,7 @@
 		gtk_combo_box_set_model (GTK_COMBO_BOX (widget), priv->device_model);
 		gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
 		g_signal_connect (G_OBJECT (widget), "changed",
-		                  GTK_SIGNAL_FUNC (device_combo_changed), self);
+		                  G_CALLBACK (device_combo_changed), self);
 		if (num_added == 1) {
 			gtk_widget_hide (glade_xml_get_widget (priv->xml, "device_label"));
 			gtk_widget_hide (widget);
@@ -909,7 +909,7 @@
 		gtk_widget_grab_focus (priv->sec_combo);
 
 	security_combo_changed (priv->sec_combo, self);
-	g_signal_connect (G_OBJECT (priv->sec_combo), "changed", GTK_SIGNAL_FUNC (security_combo_changed), self);
+	g_signal_connect (G_OBJECT (priv->sec_combo), "changed", G_CALLBACK (security_combo_changed), self);
 
 	if (priv->connection) {
 		char *tmp;