diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-10-09 06:01:04 +0000 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-10-09 06:01:04 +0000 |
| commit | d812a921d6dfee774d1cc096ba9d29529272db35 (patch) | |
| tree | f7999abdb4d585abbd3cb91ed5e523ccfeb9401f | |
| parent | ffb0b5b3c9a26962e541e6063dfd3f3f256d9876 (diff) | |
| download | pidgin-d812a921d6dfee774d1cc096ba9d29529272db35.tar.gz | |
Add the Get Attention action to the PidginWindow menu structure, and
correctly initialize its value.
| -rw-r--r-- | pidgin/gtkconv.c | 13 | ||||
| -rw-r--r-- | pidgin/gtkconvwin.h | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index 62b6e7056a..a3553520e5 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -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 *gtkconv) /* 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 *gtkconv) /* 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 *gtkconv) 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 *gtkconv) /* 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); diff --git a/pidgin/gtkconvwin.h b/pidgin/gtkconvwin.h index ee42f17e61..c27f92ce8f 100644 --- a/pidgin/gtkconvwin.h +++ b/pidgin/gtkconvwin.h @@ -51,6 +51,7 @@ struct _PidginWindow GtkAction *view_log; GtkAction *send_file; + GtkAction *get_attention; GtkAction *add_pounce; GtkAction *get_info; GtkAction *invite; |