network-manager-applet r851 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Sat Aug 16 01:44:08 2008
New Revision: 851
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=851&view=rev

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

	* src/wired-dialog.c
		- (dialog_init): use standard icon theme icons

	* src/wireless-dialog.c
		- (internal_init): use standard icon theme icons; use wireless icon
			for "Connect to other..." and "Create new...", but use password
			icon when asking only for secrets (bgo #538942)



Modified:
   trunk/ChangeLog
   trunk/src/wired-dialog.c
   trunk/src/wireless-dialog.c

Modified: trunk/src/wired-dialog.c
==============================================================================
--- trunk/src/wired-dialog.c	(original)
+++ trunk/src/wired-dialog.c	Sat Aug 16 01:44:08 2008
@@ -64,6 +64,7 @@
 			 NMConnection *connection)
 {
 	WirelessSecurity *security;
+	GtkWidget *widget;
 
 	/* Hide bunch of wireless specific widgets */
 	gtk_widget_hide (glade_xml_get_widget (xml, "device_label"));
@@ -82,6 +83,10 @@
 							"security", security,
 							(GDestroyNotify) wireless_security_unref);
 
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "dialog-password");
+	widget = glade_xml_get_widget (xml, "image1");
+	gtk_image_set_from_icon_name (GTK_IMAGE (widget), "dialog-password", GTK_ICON_SIZE_DIALOG);
+
 	return TRUE;
 }
 

Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c	(original)
+++ trunk/src/wireless-dialog.c	Sat Aug 16 01:44:08 2008
@@ -841,20 +841,29 @@
 static gboolean
 internal_init (NMAWirelessDialog *self,
                NMConnection *specific_connection,
-               NMDevice *specific_device)
+               NMDevice *specific_device,
+               gboolean auth_only)
 {
 	NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
 	GtkWidget *widget;
-	char *label;
+	char *label, *icon_name = "network-wireless";
 	gboolean security_combo_focus = FALSE;
 
 	gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_container_set_border_width (GTK_CONTAINER (self), 6);
 	gtk_window_set_default_size (GTK_WINDOW (self), 488, -1);
-	gtk_window_set_icon_name (GTK_WINDOW (self), "gtk-dialog-authentication");
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 	gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 
+	if (auth_only)
+		icon_name = "dialog-password";
+	else
+		icon_name = "network-wireless";
+
+	gtk_window_set_icon_name (GTK_WINDOW (self), icon_name);
+	widget = glade_xml_get_widget (priv->xml, "image1");
+	gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
+
 	gtk_box_set_spacing (GTK_BOX (gtk_bin_get_child (GTK_BIN (self))), 2);
 
 	widget = gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
@@ -1055,7 +1064,7 @@
 	priv->sec_combo = glade_xml_get_widget (priv->xml, "security_combo");
 	priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-	if (!internal_init (self, connection, device)) {
+	if (!internal_init (self, connection, device, TRUE)) {
 		nm_warning ("Couldn't create wireless security dialog.");
 		g_object_unref (self);
 		return NULL;
@@ -1083,7 +1092,7 @@
 	priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	priv->adhoc_create = create;
 
-	if (!internal_init (self, NULL, NULL)) {
+	if (!internal_init (self, NULL, NULL, FALSE)) {
 		nm_warning ("Couldn't create wireless security dialog.");
 		g_object_unref (self);
 		return NULL;