[empathy: 24/35] Setting "window" data on submenu only if it's not NULL

[Danielle Madeley <daniellem src gnome org>]

commit dfbccc45923082027415c3c76322febf470c5901
Author: Chandni Verma <chandniverma2112 gmail com>
Date:   Fri Mar 11 07:50:51 2011 +0530

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

 src/empathy-chat-window.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 73856ad..23c93a1 100644
--- 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);