pidgin/pidgin

Use the GtkWidget for a menu instead of its GtkAction.
cpw.qulogic.gtk3
2012-02-23, Elliott Sales de Andrade
0b7c0d24822c
Parents 3d753f511330
Children e9d886909697
Use the GtkWidget for a menu instead of its GtkAction.
--- a/pidgin/gtkconv.c Thu Feb 23 08:13:23 2012 +0000
+++ b/pidgin/gtkconv.c Thu Feb 23 09:00:17 2012 +0000
@@ -3392,6 +3392,7 @@
static void
regenerate_attention_items(PidginWindow *win)
{
+ GtkWidget *attention;
GtkWidget *menu;
PurpleConversation *conv;
PurpleConnection *pc;
@@ -3403,8 +3404,11 @@
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 @@
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);
}
}