Setting "window" data on submenu only if it's not NULL

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 73856adde392b7bf88e97e2216f43313087ff248..23c93a15bb4bc0662e7c297bc695a3c663c7ca5a 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -418,10 +418,10 @@ 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);