fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 07:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Dan Williams 2005-10-10 12:57:04 +00:00
parent 2916c77466
commit 2baf5855c0
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
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>

7
gnome/applet/applet-dbus-info.c
View file

@ -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,