# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1314658203 0
# Node ID 011abe09b2646c6b529ae285dfccbc642e38e635
# Parent  44d3e067ca461fe7dcb92a88ae99aba7505b0922# Parent  a13f4cad3cdde6ad588c7886b9f630ee998cf86e
merge of '808c311196ce8853437bde38c9e3c0864698a4d4'
     and 'b5432d58ea3fe5a2182f1eb3ee4fceb12118f088'

diff -r a13f4cad3cdd -r 011abe09b264 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Aug 29 22:43:18 2011 +0000
+++ b/pidgin/gtkconv.c	Mon Aug 29 22:50:03 2011 +0000
@@ -4848,7 +4848,7 @@
 
 	gtkchat->list = list;
 
-	gtk_box_pack_start(GTK_BOX(lbox), 
+	gtk_box_pack_start(GTK_BOX(lbox),
 		pidgin_make_scrollable(list, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 0);
 }
@@ -6451,7 +6451,7 @@
 
 	if (!gdk_pixbuf_loader_write(smiley->loader, data, size, &error) || error) {
 		purple_debug_warning("gtkconv", "gdk_pixbuf_loader_write() "
-				"failed with size=%zu: %s\n", size,
+				"failed with size=%" G_GSIZE_FORMAT ": %s\n", size,
 				error ? error->message : "(no error message)");
 		if (error)
 			g_error_free(error);