2004-08-20 Dan Williams <dcbw@redhat.com>

	* info-daemon/NetworkManagerInfoPassphraseDialog.c
		- (nmi_passphrase_dialog_ok_clicked): when updating the wep key
			for a network, set the essid as well since it may not exist yet
		- (nmi_passphrase_dialog_init): don't star out the passphrase field,
			since WEP keys/passphrases are long and prone to entry-error

	* panel-applet/Makefile.am
	  panel-applet/wired.png
		- Add (pulled from system-config-network temporarily)

	* panel-applet/NMWirelessApplet.[ch]
		- Show wired picture when a wired connection is used
		- Rename wireless icon enums, adding WIRELESS

	* src/NetworkManagerDevice.c
		- (nm_device_activate_wireless): unset encryption before bringing
			down the card and setting the essid
		- (nm_device_activatin_worker): request a key from the user if the
			AP we are connecting to is encrypted but we don't have a key
			for it yet
		- (nm_device_set_user_key_for_network): fix missing '== 0' for a
			strcmp() that prevented a user-entered key from actually getting
			used


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@58 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

1 files changed, 3 insertions, 3 deletions

diff --git a/info-daemon/NetworkManagerInfoPassphraseDialog.c b/info-daemon/NetworkManagerInfoPassphraseDialog.c
index 639fd870de..9f79e18321 100644
--- a/info-daemon/NetworkManagerInfoPassphraseDialog.c
+++ b/info-daemon/NetworkManagerInfoPassphraseDialog.c
@@ -101,6 +101,9 @@ void nmi_passphrase_dialog_ok_clicked (GtkWidget *ok_button, gpointer user_data)
 			key = g_strdup_printf ("%s/%s/key", NMI_GCONF_TRUSTED_NETWORKS_PATH, network);
 			gconf_client_set_string (info->gconf_client, key, passphrase, NULL);
 			g_free (key);
+			key = g_strdup_printf ("%s/%s/essid", NMI_GCONF_TRUSTED_NETWORKS_PATH, network);
+			gconf_client_set_string (info->gconf_client, key, network, NULL);
+			g_free (key);
 		}
 
 		nmi_passphrase_dialog_clear (dialog, entry);
@@ -219,9 +222,6 @@ int nmi_passphrase_dialog_init (NMIAppInfo *info)
 	g_signal_connect (G_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (nmi_passphrase_dialog_cancel_clicked), info);
 
 	entry = GTK_ENTRY (glade_xml_get_widget (info->passphrase_dialog, "passphrase_entry"));
-	gtk_entry_set_visibility (entry, FALSE);
-	gtk_entry_set_invisible_char (entry, '*');
-
 	nmi_passphrase_dialog_clear (dialog, GTK_WIDGET (entry));
 
 	return (0);