changeset 18801:d9692b58ac2c

Install 22px icons in right place. Fixes #2411
author Sean Egan <seanegan@gmail.com>
date Mon, 06 Aug 2007 00:56:05 +0000
parents 355f24d20501
children 5a5ca6438308
files pidgin/gtkimhtml.c pidgin/pixmaps/icons/22/Makefile.am
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- 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)