diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-14 09:58:00 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-14 09:58:00 +0800 |
commit | 8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd (patch) | |
tree | 5c1858c474144e0cd511fc6891e9d21ef978c5e3 /src/empathy-chat-window.c | |
parent | 2e3e5e8e732fbc2e4d3ed61892aefa09efabbfc2 (diff) | |
parent | c0eca0414ca529da3b083c099ec3031436420b00 (diff) | |
download | gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.gz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.bz2 gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.lz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.xz gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.tar.zst gsoc2013-empathy-8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd.zip |
Merge branch 'glassrose-contact-blocking-rebase'
Diffstat (limited to 'src/empathy-chat-window.c')
-rw-r--r-- | src/empathy-chat-window.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 799a8254d..23c93a15b 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -417,12 +417,15 @@ chat_window_contact_menu_update (EmpathyChatWindowPriv *priv, if (orig_submenu == NULL || !gtk_widget_get_visible (orig_submenu)) { submenu = empathy_chat_get_contact_menu (priv->current_chat); + if (submenu != NULL) { + /* gtk_menu_attach_to_widget() doesn't behave nicely here */ + g_object_set_data (G_OBJECT (submenu), "window", priv->dialog); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu); gtk_widget_show (menu); gtk_widget_set_sensitive (menu, TRUE); - } - else { + } else { gtk_widget_set_sensitive (menu, FALSE); } } else { |