# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1242957736 0
# Node ID a4a2090fd976a864c1047357c0d020223b3b5a84
# Parent  c2ac87c5a035adf6cea5a5dd72a4f3389bcc4faa# Parent  401f580d56d4f3d11df9edcefbe63d7a1bd1cd2f
propagate from branch 'im.pidgin.pidgin' (head e09226ff43686401f45368b4047b907c205abfba)
            to branch 'im.pidgin.pidgin.yaz' (head 72a5b5a959c3a2f3dca202af7f2d6d6acaf77c04)

diff -r c2ac87c5a035 -r a4a2090fd976 libpurple/nat-pmp.c
--- a/libpurple/nat-pmp.c	Thu May 21 15:04:44 2009 +0000
+++ b/libpurple/nat-pmp.c	Fri May 22 02:02:16 2009 +0000
@@ -200,7 +200,7 @@
 
     if (!(buf = malloc(needed)))
 	{
-		purple_debug_warning("nat-pmp", "Failed to malloc %i\n", needed);
+		purple_debug_warning("nat-pmp", "Failed to malloc %" G_GSIZE_FORMAT "\n", needed);
 		return NULL;
     }
 
diff -r c2ac87c5a035 -r a4a2090fd976 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Thu May 21 15:04:44 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Fri May 22 02:02:16 2009 +0000
@@ -592,7 +592,7 @@
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
 			purple_debug_error("msn",
-				"Oversized slpmsg - msgsize=%lld offset=%" G_GSIZE_FORMAT " len=%" G_GSIZE_FORMAT "\n",
+				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
 				slpmsg->size, offset, len);
 			g_return_if_reached();
 		}
diff -r c2ac87c5a035 -r a4a2090fd976 pidgin/Makefile.am
--- a/pidgin/Makefile.am	Thu May 21 15:04:44 2009 +0000
+++ b/pidgin/Makefile.am	Fri May 22 02:02:16 2009 +0000
@@ -140,8 +140,6 @@
 	gtkcellrendererprogress.h \
 	gtkcellview.h \
 	gtkcellviewmenuitem.h \
-	gtkcellview.h \
-	gtkcellviewmenuitem.h \
 	gtkcertmgr.h \
 	pidgincombobox.h \
 	gtkconn.h \