summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2012-02-23 09:00:17 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2012-02-23 09:00:17 +0000
commit7a8b90fdcb9d315014015899e94b1f27eac8f904 (patch)
tree06b29a27f2ac70c35f20a25dc8786c7a3f4db4ac
parent1358f56c810f232b7dade2ff0dbe670d528f1758 (diff)
downloadpidgin-7a8b90fdcb9d315014015899e94b1f27eac8f904.tar.gz
Use the GtkWidget for a menu instead of its GtkAction.
-rw-r--r--pidgin/gtkconv.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 1a9ff016cf..8ca0eaf468 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -3392,6 +3392,7 @@ regenerate_media_items(PidginWindow *win)
static void
regenerate_attention_items(PidginWindow *win)
{
+ GtkWidget *attention;
GtkWidget *menu;
PurpleConversation *conv;
PurpleConnection *pc;
@@ -3403,8 +3404,11 @@ regenerate_attention_items(PidginWindow *win)
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 *win)
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);
}
}