cpw.qulogic.gtk3: 73e751dc: Add the Get Attention action to the Pidg...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 73e751dca6eeea864e920c9d86e660e7ba1b03d0
Parent:   381bba1ca420d0754498ed2bbbe2a11783f61f14
Author:   qulogic at pidgin.im
Date:     10/09/11 02:01:04
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/73e751dca6eeea864e920c9d86e660e7ba1b03d0

Changelog: 

Add the Get Attention action to the PidginWindow menu structure, and
correctly initialize its value.

Changes against parent 381bba1ca420d0754498ed2bbbe2a11783f61f14

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

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	bb469159fe7eab1d6909b5d10a84a435f3f98ba3
+++ pidgin/gtkconv.c	bc2925f2592603fd0dbb431907aaad59510e78ae
@@ -3567,6 +3567,10 @@ setup_menubar(PidginWindow *win)
 		gtk_ui_manager_get_action(win->menu.ui,
 		                          "/Conversation/ConversationMenu/SendFile");
 
+	win->menu.get_attention =
+		gtk_ui_manager_get_action(win->menu.ui,
+		                          "/Conversation/ConversationMenu/GetAttention");
+
 	win->menu.add_pounce =
 		gtk_ui_manager_get_action(win->menu.ui,
 		                          "/Conversation/ConversationMenu/AddBuddyPounce");
@@ -6925,7 +6929,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Deal with menu items */
 		gtk_action_set_visible(win->menu.view_log, TRUE);
 		gtk_action_set_visible(win->menu.send_file, TRUE);
-		gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), TRUE);
+		gtk_action_set_visible(win->menu.get_attention, TRUE);
 		gtk_action_set_visible(win->menu.add_pounce, TRUE);
 		gtk_action_set_visible(win->menu.get_info, TRUE);
 		gtk_action_set_visible(win->menu.invite, FALSE);
@@ -6954,7 +6958,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Deal with menu items */
 		gtk_action_set_visible(win->menu.view_log, TRUE);
 		gtk_action_set_visible(win->menu.send_file, FALSE);
-		gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), FALSE);
+		gtk_action_set_visible(win->menu.get_attention, FALSE);
 		gtk_action_set_visible(win->menu.add_pounce, FALSE);
 		gtk_action_set_visible(win->menu.get_info, FALSE);
 		gtk_action_set_visible(win->menu.invite, TRUE);
@@ -7036,7 +7040,7 @@ gray_stuff_out(PidginConversation *gtkco
 			gtk_action_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_action_set_sensitive(g_object_get_data(G_OBJECT(win->window), "get_attention"), (prpl_info->send_attention != NULL));
+			gtk_action_set_sensitive(win->menu.get_attention, (prpl_info->send_attention != NULL));
 			gtk_action_set_sensitive(win->menu.alias,
 									 (account != NULL) &&
 									 (purple_find_buddy(account, purple_conversation_get_name(conv)) != NULL));
@@ -7057,8 +7061,7 @@ gray_stuff_out(PidginConversation *gtkco
 		/* Then deal with menu items */
 		gtk_action_set_sensitive(win->menu.view_log, TRUE);
 		gtk_action_set_sensitive(win->menu.send_file, FALSE);
-		gtk_action_set_sensitive(g_object_get_data(G_OBJECT(win->window),
-			"get_attention"), FALSE);
+		gtk_action_set_sensitive(win->menu.get_attention, FALSE);
 		gtk_action_set_sensitive(win->menu.add_pounce, TRUE);
 		gtk_action_set_sensitive(win->menu.get_info, FALSE);
 		gtk_action_set_sensitive(win->menu.invite, FALSE);
============================================================
--- pidgin/gtkconvwin.h	bd944cd044107ce07238281794597f12b90c8ec7
+++ pidgin/gtkconvwin.h	87c9e1be73f62e4ecd3fa804e9fe93c24b85fe3b
@@ -51,6 +51,7 @@ struct _PidginWindow
 		GtkAction *view_log;
 
 		GtkAction *send_file;
+		GtkAction *get_attention;
 		GtkAction *add_pounce;
 		GtkAction *get_info;
 		GtkAction *invite;