From 2baf5855c00faa308d158e211232f8720f5a3d55 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 10 Oct 2005 12:57:04 +0000 Subject: [PATCH] 2005-10-10 Dan Williams * 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 --- ChangeLog | 6 ++++++ gnome/applet/applet-dbus-info.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7a21142e50..e1efaa605a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-10 Dan Williams + + * 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 Patch from Bill Moss diff --git a/gnome/applet/applet-dbus-info.c b/gnome/applet/applet-dbus-info.c index 2ec83e8107..3b83a030a6 100644 --- a/gnome/applet/applet-dbus-info.c +++ b/gnome/applet/applet-dbus-info.c @@ -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,