diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-10-26 00:54:49 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-10-26 01:00:27 +0800 |
| commit | 024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a (patch) | |
| tree | ef2b34da516a59207340d2c5dee5cdc73c2d321e | |
| parent | 2331c9bf7995be07797a42c3ebc3f91aa03db529 (diff) | |
| download | gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar.gz gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar.bz2 gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar.lz gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar.xz gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.tar.zst gsoc2013-empathy-024768c3ddf14234bb9ee7a8d4ab585aa4de0a3a.zip | |
Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safe
| -rw-r--r-- | src/empathy-chat-window.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 382e29327..985fa882f 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); |