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

[dcbw svn gnome org]

Author: dcbw
Date: Thu Aug 14 21:02:23 2008
New Revision: 845
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=845&view=rev

Log:
2008-08-14  Dan Williams  <dcbw redhat com>

	* src/applet-device-cdma.c
	  src/applet-device-gsm.c
	  src/applet-device-wired.c
	  src/connection-editor/page-wired-security.c
	  src/wired-dialog.c
		- Don't use gtk_box_pack_start_defaults(), which is deprecated
			(bgo #547158)



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-cdma.c
   trunk/src/applet-device-gsm.c
   trunk/src/applet-device-wired.c
   trunk/src/connection-editor/page-wired-security.c
   trunk/src/wired-dialog.c

Modified: trunk/src/applet-device-cdma.c
==============================================================================
--- trunk/src/applet-device-cdma.c	(original)
+++ trunk/src/applet-device-cdma.c	Thu Aug 14 21:02:23 2008
@@ -421,16 +421,16 @@
 	gtk_window_set_default (GTK_WINDOW (dialog), info->ok_button);
 
 	w = gtk_label_new (_("A password is required to connect to the CDMA network."));
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
 	w = gtk_label_new (NULL);
 	gtk_label_set_markup (GTK_LABEL (w), dev_str);
 	g_free (dev_str);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
 	gtk_container_set_border_width (GTK_CONTAINER (box), 6);

Modified: trunk/src/applet-device-gsm.c
==============================================================================
--- trunk/src/applet-device-gsm.c	(original)
+++ trunk/src/applet-device-gsm.c	Thu Aug 14 21:02:23 2008
@@ -459,16 +459,16 @@
 		w = gtk_label_new (_("PIN code is needed for the GSM device"));
 	else if (!strcmp (secret_name, NM_SETTING_GSM_PUK))
 		w = gtk_label_new (_("PUK code is needed for the GSM device"));
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
 	w = gtk_label_new (NULL);
 	gtk_label_set_markup (GTK_LABEL (w), dev_str);
 	g_free (dev_str);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
 	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
@@ -524,16 +524,16 @@
 	gtk_window_set_default (GTK_WINDOW (dialog), info->ok_button);
 
 	w = gtk_label_new (_("A password is required to connect to the GSM network."));
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
 	w = gtk_label_new (NULL);
 	gtk_label_set_markup (GTK_LABEL (w), dev_str);
 	g_free (dev_str);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
-	gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), w);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
 
 	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
 	gtk_container_set_border_width (GTK_CONTAINER (box), 6);

Modified: trunk/src/applet-device-wired.c
==============================================================================
--- trunk/src/applet-device-wired.c	(original)
+++ trunk/src/applet-device-wired.c	Thu Aug 14 21:02:23 2008
@@ -485,8 +485,9 @@
 	w = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
 	info->ok_button = w;
 
-	gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-								 glade_xml_get_widget (xml, "DslPage"));
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+	                    glade_xml_get_widget (xml, "DslPage"),
+	                    TRUE, TRUE, 0);
 
 	pppoe_update_ui (NM_SETTING_PPPOE (nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE)), info);
 	g_object_weak_ref (G_OBJECT (dialog), pppoe_info_destroy, info);

Modified: trunk/src/connection-editor/page-wired-security.c
==============================================================================
--- trunk/src/connection-editor/page-wired-security.c	(original)
+++ trunk/src/connection-editor/page-wired-security.c	Thu Aug 14 21:02:23 2008
@@ -98,7 +98,7 @@
 	gtk_widget_set_sensitive (priv->security_widget, setting != NULL);
 
 	gtk_box_pack_start (GTK_BOX (parent->page), GTK_WIDGET (priv->enabled), FALSE, TRUE, 12);
-	gtk_box_pack_start_defaults (GTK_BOX (parent->page), priv->security_widget);
+	gtk_box_pack_start (GTK_BOX (parent->page), priv->security_widget, TRUE, TRUE, 0);
 	g_object_ref_sink (parent->page);
 	gtk_widget_show_all (parent->page);
 

Modified: trunk/src/wired-dialog.c
==============================================================================
--- trunk/src/wired-dialog.c	(original)
+++ trunk/src/wired-dialog.c	Thu Aug 14 21:02:23 2008
@@ -51,7 +51,7 @@
 	for (iter = children; iter; iter = iter->next)
 		gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (iter->data));
 
-	gtk_box_pack_start_defaults (box, wireless_security_get_widget (security));
+	gtk_box_pack_start (box, wireless_security_get_widget (security), TRUE, TRUE, 0);
 
 	return security;
 }