# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1177451769 0
# Node ID 69ed7b52faebebaaf635d75486930ddb5ab5bd52
# Parent  fea7c90a50670369fa7cff2286f4df9307ed2502# Parent  ca75eccdca3dabfefaa58377bfbb3270ac088f16
merge of '71d55b79094812b06899c2bbe86ce7a8507ac80e'
     and 'a917d2f315679edd311d8a5baf70d398fd4f877a'

diff -r fea7c90a5067 -r 69ed7b52faeb pidgin/gtkdocklet-x11.c
--- a/pidgin/gtkdocklet-x11.c	Tue Apr 24 21:44:13 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Tue Apr 24 21:56:09 2007 +0000
@@ -142,9 +142,10 @@
 docklet_x11_blank_icon()
 {
 	if (!blank_icon) {
+		GtkIconSize size = GTK_ICON_SIZE_LARGE_TOOLBAR;
 		gint width, height;
-
-		gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &width, &height);
+		g_object_get(G_OBJECT(image), "icon-size", &size, NULL);
+		gtk_icon_size_lookup(size, &width, &height);
 		blank_icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
 		gdk_pixbuf_fill(blank_icon, 0);
 	}