cpw.qulogic.gtk3: ec42ed41: Use the GtkWidget for a menu instead of ...

qulogic at pidgin.im qulogic at pidgin.im
Thu Feb 23 04:06:34 EST 2012


----------------------------------------------------------------------
Revision: ec42ed4101a842f3dc81c13f1942996951d08422
Parent:   9dbab2ab1f8ef75dfa8eeed28c8834ab28296960
Author:   qulogic at pidgin.im
Date:     02/23/12 04:00:17
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/ec42ed4101a842f3dc81c13f1942996951d08422

Changelog: 

Use the GtkWidget for a menu instead of its GtkAction.

Changes against parent 9dbab2ab1f8ef75dfa8eeed28c8834ab28296960

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	1a5e14644e40c067b91f6849526fcf8c37bc1379
+++ pidgin/gtkconv.c	5b3ff229ab84a473b94dceeae51b68b50ac13e91
@@ -3392,6 +3392,7 @@ regenerate_attention_items(PidginWindow 
 static void
 regenerate_attention_items(PidginWindow *win)
 {
+	GtkWidget *attention;
 	GtkWidget *menu;
 	PurpleConversation *conv;
 	PurpleConnection *pc;
@@ -3403,8 +3404,11 @@ regenerate_attention_items(PidginWindow 
 	if (!conv)
 		return;
 
+	attention = gtk_ui_manager_get_widget(win->menu.ui,
+	                                      "/Conversation/ConversationMenu/GetAttention");
+
 	/* Remove the previous entries */
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(win->menu.get_attention), NULL);
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(attention), NULL);
 
 	pc = purple_conversation_get_connection(conv);
 	if (pc != NULL)
@@ -3437,7 +3441,7 @@ regenerate_attention_items(PidginWindow 
 				list = g_list_delete_link(list, list);
 			}
 
-			gtk_menu_item_set_submenu(GTK_MENU_ITEM(win->menu.get_attention), menu);
+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(attention), menu);
 			gtk_widget_show_all(menu);
 		}
 	}


More information about the Commits mailing list