# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1225316016 0
# Node ID 9e07b1c140750e95ec13d1ac56fe6e02e6812b28
# Parent  602f3b6ddbbfb8cb8b93c26caf422bc16947ef92
Make the "Get Attention" menu item work correctly

diff -r 602f3b6ddbbf -r 9e07b1c14075 pidgin/gtkconv.c
--- 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..."));
diff -r 602f3b6ddbbf -r 9e07b1c14075 pidgin/gtkimhtmltoolbar.c
--- 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);
 }