pidgin: 26dc609c: Add the get_attention widget to the Pidg...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 26dc609ca93ded5c37bf9a4ea50d65438f920aa3
Parent:   29c3498ec7838b3a57d07d6ee610768298218429
Author:   qulogic at pidgin.im
Date:     10/23/11 21:15:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/26dc609ca93ded5c37bf9a4ea50d65438f920aa3

Changelog: 

Add the get_attention widget to the PidginWindow structure, instead of
an added GObject data of the window.

Changes against parent 29c3498ec7838b3a57d07d6ee610768298218429

  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconvwin.h

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	26eca2029be0bfaccd5d6724cb4d63f04d440583
+++ pidgin/gtkconv.c	c5c23181e18da617573b2511d66e035b989e5d91
@@ -3534,9 +3534,10 @@ setup_menubar(PidginWindow *win)
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/Send File..."));
 
-	g_object_set_data(G_OBJECT(win->window), "get_attention",
+	win->menu.get_attention =
 		gtk_item_factory_get_widget(win->menu.item_factory,
-			                    N_("/Conversation/Get Attention")));
+			                    N_("/Conversation/Get Attention"));
+
 	win->menu.add_pounce =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Conversation/Add Buddy Pounce..."));
@@ -6884,7 +6885,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Deal with menu items */
 		gtk_widget_show(win->menu.view_log);
 		gtk_widget_show(win->menu.send_file);
-		gtk_widget_show(g_object_get_data(G_OBJECT(win->window), "get_attention"));
+		gtk_widget_show(win->menu.get_attention);
 		gtk_widget_show(win->menu.add_pounce);
 		gtk_widget_show(win->menu.get_info);
 		gtk_widget_hide(win->menu.invite);
@@ -6913,7 +6914,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Deal with menu items */
 		gtk_widget_show(win->menu.view_log);
 		gtk_widget_hide(win->menu.send_file);
-		gtk_widget_hide(g_object_get_data(G_OBJECT(win->window), "get_attention"));
+		gtk_widget_hide(win->menu.get_attention);
 		gtk_widget_hide(win->menu.add_pounce);
 		gtk_widget_hide(win->menu.get_info);
 		gtk_widget_show(win->menu.invite);
@@ -6995,7 +6996,7 @@ gray_stuff_out(PidginConversation *gtkco
 			gtk_widget_set_sensitive(win->menu.send_file,
 									 (prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||
 									  prpl_info->can_receive_file(gc, purple_conversation_get_name(conv)))));
-			gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), (prpl_info->send_attention != NULL));
+			gtk_widget_set_sensitive(win->menu.get_attention, (prpl_info->send_attention != NULL));
 			gtk_widget_set_sensitive(win->menu.alias,
 									 (account != NULL) &&
 									 (purple_find_buddy(account, purple_conversation_get_name(conv)) != NULL));
@@ -7016,8 +7017,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Then deal with menu items */
 		gtk_widget_set_sensitive(win->menu.view_log, TRUE);
 		gtk_widget_set_sensitive(win->menu.send_file, FALSE);
-		gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(win->window),
-			"get_attention"), FALSE);
+		gtk_widget_set_sensitive(win->menu.get_attention, FALSE);
 		gtk_widget_set_sensitive(win->menu.add_pounce, TRUE);
 		gtk_widget_set_sensitive(win->menu.get_info, FALSE);
 		gtk_widget_set_sensitive(win->menu.invite, FALSE);
============================================================
--- pidgin/gtkconvwin.h	64dce6ceccc0449184700ec1ea13f9930a035d0f
+++ pidgin/gtkconvwin.h	51291492c83e22094dbf297aabf37a8fd0f92132
@@ -51,6 +51,7 @@ struct _PidginWindow
 		GtkWidget *view_log;
 
 		GtkWidget *send_file;
+		GtkWidget *get_attention;
 		GtkWidget *add_pounce;
 		GtkWidget *get_info;
 		GtkWidget *invite;