pidgin: 2331ff0a: Fix clicking on buttons in formatting to...

[nosnilmot at pidgin.im]

----------------------------------------------------------------------
Revision: 2331ff0a5cbe7c0ae11fe5411c3aa8845715c9fd
Parent:   307e908687637931b9f8ae0227fcd515724bdd13
Author:   nosnilmot at pidgin.im
Date:     01/06/11 14:46:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2331ff0a5cbe7c0ae11fe5411c3aa8845715c9fd

Changelog: 

Fix clicking on buttons in formatting toolbar so they don't try (and
fail) to fire twice unless they are held down for a longer click.

Changes against parent 307e908687637931b9f8ae0227fcd515724bdd13

  patched  pidgin/gtkimhtmltoolbar.c

-------------- next part --------------
============================================================
--- pidgin/gtkimhtmltoolbar.c	d4c57d3f6191f8b2f1f3fead86db7c42b332d409
+++ pidgin/gtkimhtmltoolbar.c	c3c7078c5a2582604ac8716a8450b76458e6ea8a
@@ -1251,7 +1251,7 @@ static void gtk_imhtmltoolbar_create_old
 	for (iter = 0; buttons[iter].stock; iter++) {
 		if (buttons[iter].stock[0]) {
 			button = pidgin_pixbuf_toolbar_button_from_stock(buttons[iter].stock);
-			g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
+			g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(gtk_imhtmltoolbar_popup_menu), toolbar);
 			g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(buttons[iter].callback), toolbar);
 			*(buttons[iter].button) = button;
@@ -1262,7 +1262,7 @@ static void gtk_imhtmltoolbar_create_old
 	}
 	/* create the attention button (this is a bit hacky to not break ABI) */
 	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION);
-	g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
+	g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(gtk_imhtmltoolbar_popup_menu), toolbar);
 	g_signal_connect(G_OBJECT(button), "clicked",
 		G_CALLBACK(send_attention_cb), toolbar);
 	g_object_set_data(G_OBJECT(toolbar), "attention", button);
@@ -1471,7 +1471,7 @@ static void gtk_imhtmltoolbar_init (GtkI
 	label = gtk_label_new_with_mnemonic(_("_Smile!"));
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(smiley_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
+	g_signal_connect(G_OBJECT(smiley_button), "button-press-event", G_CALLBACK(gtk_imhtmltoolbar_popup_menu), toolbar);
 	g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
 	gtk_widget_show_all(smiley_button);