diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-17 22:25:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-17 22:25:27 +0800 |
| commit | ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3 (patch) | |
| tree | 0ce3d3718e1c069abe6fa910651c5518bd0fc1a5 | |
| parent | ce99c073f333f7d29c19e3db9a3610f6ea327b39 (diff) | |
| download | gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar.gz gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar.bz2 gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar.lz gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar.xz gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.tar.zst gsoc2013-empathy-ed2a37c2c6f41bb1f5704d2a2f748157fb054fc3.zip | |
chat_window_contact_menu_update: unsensitive the menu if there is no submenu
This is a manual backport from master.
| -rw-r--r-- | src/empathy-chat-window.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 30a1f3183..32339bde4 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -405,11 +405,17 @@ 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); - /* gtk_menu_attach_to_widget () doesn't behave nicely here */ - g_object_set_data (G_OBJECT (submenu), "window", priv->dialog); + 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 { + gtk_widget_set_sensitive (menu, FALSE); + } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu); - gtk_widget_show (menu); } else { tp_g_signal_connect_object (orig_submenu, "notify::visible", |