# HG changeset patch
# User Richard Nelson <wabz@pidgin.im>
# Date 1186364724 0
# Node ID 580e0bfe7e339be565cf27b472e8986fb58e8d8b
# Parent  6af9201ac685a1809a9fc1de71ff79a9e95a81ed# Parent  5a5ca643830892fde99e2044c1254215033efb3c
merge of '412ec3e9ae5d5532710d56efecc7543837a91cbb'
     and '8f73315c03954666c69c055abbe62ee2e135c4cf'

diff -r 6af9201ac685 -r 580e0bfe7e33 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Mon Aug 06 01:45:16 2007 +0000
+++ b/pidgin/gtkimhtml.c	Mon Aug 06 01:45:24 2007 +0000
@@ -1053,7 +1053,7 @@
 	if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
 		return;
 
-	if (selection_data->length < 0) {
+	if (imhtml->wbfo || selection_data->length < 0) {
 		gtk_clipboard_request_text(clipboard, paste_plaintext_received_cb, imhtml);
 		return;
 	} else {
diff -r 6af9201ac685 -r 580e0bfe7e33 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Mon Aug 06 01:45:16 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Mon Aug 06 01:45:24 2007 +0000
@@ -939,12 +939,10 @@
 		*y -= widget->allocation.height;
 }
 
-static void pidgin_menu_clicked(GtkWidget *button, GtkMenu *menu)
+static void pidgin_menu_clicked(GtkWidget *button, GdkEventButton *event, GtkMenu *menu)
 {
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-		gtk_widget_show_all(GTK_WIDGET(menu));
-		gtk_menu_popup(menu, NULL, NULL, menu_position_func, button, 0, gtk_get_current_event_time());
-	}
+	gtk_widget_show_all(GTK_WIDGET(menu));
+	gtk_menu_popup(menu, NULL, NULL, menu_position_func, button, 0, gtk_get_current_event_time());
 }
 
 static void pidgin_menu_deactivate(GtkWidget *menu, GtkToggleButton *button)
@@ -1179,7 +1177,7 @@
 				G_CALLBACK(button_sensitiveness_changed), menuitem);
 	}
 
-	g_signal_connect(G_OBJECT(font_button), "clicked", G_CALLBACK(pidgin_menu_clicked), font_menu);
+	g_signal_connect(G_OBJECT(font_button), "button-press-event", G_CALLBACK(pidgin_menu_clicked), font_menu);
 	g_signal_connect(G_OBJECT(font_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), font_button);
 
 	/* Sep */
@@ -1220,7 +1218,7 @@
 	g_signal_connect(G_OBJECT(toolbar->link), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
 
-	g_signal_connect(G_OBJECT(insert_button), "clicked", G_CALLBACK(pidgin_menu_clicked), insert_menu);
+	g_signal_connect(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
 	toolbar->sml = NULL;
 }
diff -r 6af9201ac685 -r 580e0bfe7e33 pidgin/pixmaps/icons/22/Makefile.am
--- a/pidgin/pixmaps/icons/22/Makefile.am	Mon Aug 06 01:45:16 2007 +0000
+++ b/pidgin/pixmaps/icons/22/Makefile.am	Mon Aug 06 01:45:24 2007 +0000
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = pidgin.png 
 
-pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps
+pidginiconspixdir = $(datadir)/icons/hicolor/22x22/apps
 
 pidginiconspix_DATA = $(EXTRA_DIST)