# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1186361765 0
# Node ID d9692b58ac2cfb875619010650149f00f7ad510c
# Parent  355f24d20501345976d4f1bdc3320d93fcb633c5
Install 22px icons in right place. Fixes #2411

diff -r 355f24d20501 -r d9692b58ac2c pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Sun Aug 05 03:16:58 2007 +0000
+++ b/pidgin/gtkimhtml.c	Mon Aug 06 00:56:05 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 355f24d20501 -r d9692b58ac2c pidgin/pixmaps/icons/22/Makefile.am
--- a/pidgin/pixmaps/icons/22/Makefile.am	Sun Aug 05 03:16:58 2007 +0000
+++ b/pidgin/pixmaps/icons/22/Makefile.am	Mon Aug 06 00:56:05 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)