# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1278118899 0
# Node ID eada0ae4df0059427a6a1398c8a40d65d6cfb709
# Parent  2ab000954affbd3eda8f483fa865862cf81f1cc0# Parent  d371035542b28e360d10c78af3f4982255ee975d
merge of '2774f6446b6bd057a7012aad6408b8dea457fbf6'
     and '369315b95ea96caa0f91acbabf434a6a0177f450'

diff -r d371035542b2 -r eada0ae4df00 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Fri Jul 02 18:21:07 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Jul 03 01:01:39 2010 +0000
@@ -1323,6 +1323,7 @@
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
 	GtkWidget *sep;
+	GObject *wide_attention_button;
 	int i;
 	struct {
 		const char *label;
@@ -1467,6 +1468,8 @@
 	gtk_widget_show_all(sep);
 
 	/* Attention */
+	wide_attention_button = g_object_get_data(G_OBJECT(toolbar), "attention");
+
 	attention_button = gtk_button_new();
 	gtk_button_set_relief(GTK_BUTTON(attention_button), GTK_RELIEF_NONE);
 	bbox = gtk_hbox_new(FALSE, 3);
@@ -1478,17 +1481,15 @@
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), attention_button, FALSE, FALSE, 0);
 	g_signal_connect_swapped(G_OBJECT(attention_button), "clicked", 
-		G_CALLBACK(gtk_button_clicked),
-	    g_object_get_data(G_OBJECT(toolbar), "attention"));
+		G_CALLBACK(gtk_button_clicked), wide_attention_button);
 	gtk_widget_show_all(attention_button);
 	
-	g_signal_connect(G_OBJECT(g_object_get_data(G_OBJECT(toolbar), "attention")),
+	g_signal_connect(wide_attention_button, "attention",
 	        "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), attention_button);
 
 	/* set attention button to be greyed out until we get a conversation */
-	gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(toolbar), "attention"),
-		FALSE);
+	gtk_widget_set_sensitive(wide_attention_button, FALSE);
 	
 	gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
 	g_object_set_data(G_OBJECT(hbox), "lean-view", box);