cpw.attention_ui: 154daed8: Make the "Get Attention" menu item work ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 154daed80ee3bd269701738f9c1c80be73f58bae
Ancestor: ed75ebee744ce69a5813fad939bc54b825b8e7c4
Author: malu at pidgin.im
Date: 2008-10-29T21:33:36
Branch: im.pidgin.cpw.attention_ui
URL: http://d.pidgin.im/viewmtn/revision/info/154daed80ee3bd269701738f9c1c80be73f58bae

Modified files:
        pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

Make the "Get Attention" menu item work correctly

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	a483bc054857558ae519d2a07b8b6ef73adec44d
+++ pidgin/gtkconv.c	0ea9437745fac3dadad2b83151cf589a2c506c59
@@ -3411,7 +3411,7 @@ setup_menubar(PidginWindow *win)
 
 	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..."));
============================================================
--- pidgin/gtkimhtmltoolbar.c	15fcd213c523a774a8e2a2d87307e4396f236d95
+++ pidgin/gtkimhtmltoolbar.c	d13da2b36b3f9089d9ceea96d2126f2cbf48a0fe
@@ -1571,7 +1571,7 @@ void gtk_imhtmltoolbar_switch_active_con
 	/* 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);
 }