# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1198323361 0
# Node ID 64aeaed21477f1d51fd48b616935c4abd0ed94b1
# Parent  3ef7dae7c8045e142eba0c19500134c0a2a1e5d9# Parent  6492a6ca4b0314221f26da47adb2e4a7437a382c
merge of '3a8b6b71a880d8b8152d3ad4c4ade2d3df3b0f5c'
     and 'c06b8cca480ac664ddec99c4a2ab51b00f30240e'

diff -r 3ef7dae7c804 -r 64aeaed21477 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Fri Dec 21 19:38:21 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sat Dec 22 11:36:01 2007 +0000
@@ -812,7 +812,6 @@
 static void hijack_menu_cb(GtkIMHtml *imhtml, GtkMenu *menu, gpointer data)
 {
 	GtkWidget *menuitem;
-	GtkWidget *mi, *img;
 
 	menuitem = gtk_menu_item_new_with_mnemonic(_("Paste as Plain _Text"));
 	gtk_widget_show(menuitem);
diff -r 3ef7dae7c804 -r 64aeaed21477 pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c	Fri Dec 21 19:38:21 2007 +0000
+++ b/pidgin/win32/winpidgin.c	Sat Dec 22 11:36:01 2007 +0000
@@ -467,7 +467,7 @@
 
 			return FALSE;
 		} else
-			printf("Error (%d) accessing \"pidgin_is_running\" mutex.\n", err);
+			printf("Error (%u) accessing \"pidgin_is_running\" mutex.\n", (UINT) err);
 	}
 	return TRUE;
 }