aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2009-10-26 00:54:49 +0800
committerXavier Claessens <xclaesse@gmail.com>2009-10-26 00:55:37 +0800
commitbe81b40879b405f5baff65c885cb564bdf2404ca (patch)
treecad232ad72eeb1f47d6b5abbf381651651a8c77b
parent71e0ec07afa999e30a85439eb7103939d557edf5 (diff)
downloadgsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar.gz
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar.bz2
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar.lz
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar.xz
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.tar.zst
gsoc2013-empathy-be81b40879b405f5baff65c885cb564bdf2404ca.zip
Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safe
-rw-r--r--src/empathy-chat-window.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index e2d946c79..00ecc773e 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -349,8 +349,7 @@ chat_window_update (EmpathyChatWindow *window)
menu = gtk_ui_manager_get_widget (priv->ui_manager,
"/chats_menubar/menu_contact");
orig_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
- if (!GTK_WIDGET_VISIBLE (orig_submenu))
- {
+ if (orig_submenu == NULL || !GTK_WIDGET_VISIBLE (orig_submenu)) {
submenu = empathy_chat_get_contact_menu (priv->current_chat);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
gtk_widget_show (menu);