# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1180646782 0
# Node ID 98dd7d5b646a1eb939e3ccb2a38b07c28e2b5118
# Parent  79c1f60ece2e52de27bde702884360ee836ad7b7# Parent  55ded28f6640b625844ef0174cb0aa7ca347738e
merge of '1444834a6af3004a03838204b528edb6e2e1f9ab'
     and '3eda7651faf29cc33099d2b5acdf25a0525f68a9'

diff -r 79c1f60ece2e -r 98dd7d5b646a pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Thu May 31 08:12:19 2007 +0000
+++ b/pidgin/gtkmain.c	Thu May 31 21:26:22 2007 +0000
@@ -473,6 +473,9 @@
 #else
 	debug_enabled = FALSE;
 #endif
+
+	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
+	g_thread_init(NULL);
 	
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
diff -r 79c1f60ece2e -r 98dd7d5b646a pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Thu May 31 08:12:19 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Thu May 31 21:26:22 2007 +0000
@@ -2029,6 +2029,10 @@
 	int w, h;
 	GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM);
 	gtk_icon_size_lookup(icon_size, &w, &h);
+	if (height > width)
+		w = width * h  / height;
+	else if (width > height)
+		h = height * w / width;
 	gdk_pixbuf_loader_set_size(loader, w, h);
 #endif
 }