Commit 2baf5855 authored by Dan Williams's avatar Dan Williams
Browse files

2005-10-10 Dan Williams <dcbw@redhat.com>

	* gnome/applet/applet-dbus-info.c
		- (nmi_dbus_get_network_key): hide the menu when putting up
			the keyring dialog.  (not sure if the code is right...)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1012 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 2916c774
2005-10-10 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus-info.c
- (nmi_dbus_get_network_key): hide the menu when putting up
the keyring dialog. (not sure if the code is right...)
2005-10-09 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss <bmoss@clemson.edu>
......
......@@ -95,6 +95,13 @@ static char *nmi_dbus_get_network_key (NMWirelessApplet *applet, const char *ess
g_return_val_if_fail (applet != NULL, NULL);
g_return_val_if_fail (essid != NULL, NULL);
/* If the menu happens to be showing when we pop up the
* keyring dialog, we get an X server deadlock. So deactivate
* the menu here.
*/
if (applet->dropdown_menu && GTK_WIDGET_VISIBLE (GTK_WIDGET (applet->dropdown_menu)))
gtk_menu_shell_deactivate (GTK_MENU_SHELL (applet->dropdown_menu));
/* Get the essid key, if any, from the keyring */
ret = gnome_keyring_find_itemsv_sync (GNOME_KEYRING_ITEM_GENERIC_SECRET,
&found_list,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment