Mercurial > pidgin.yaz
changeset 29646:9e07b1c14075
Make the "Get Attention" menu item work correctly
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 29 Oct 2008 21:33:36 +0000 |
| parents | 602f3b6ddbbf |
| children | 12c01afbb0ea |
| files | pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Oct 29 20:17:21 2008 +0000 +++ b/pidgin/gtkconv.c Wed Oct 29 21:33:36 2008 +0000 @@ -3411,7 +3411,7 @@ win->menu.get_attention = gtk_item_factory_get_widget(win->menu.item_factory, - N_("/Conversation/Get Attention...")); + N_("/Conversation/Get Attention")); win->menu.add_pounce = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/Add Buddy Pounce..."));
--- a/pidgin/gtkimhtmltoolbar.c Wed Oct 29 20:17:21 2008 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed Oct 29 21:33:36 2008 +0000 @@ -1571,7 +1571,7 @@ /* gray out attention button on protocols that don't support it for the time being it is always disabled for chats */ gtk_widget_set_sensitive(toolbar->attention, - purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && + conv && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && PURPLE_PLUGIN_PROTOCOL_INFO(prpl)->send_attention != NULL); }