Mercurial > pidgin
changeset 21919:64aeaed21477
merge of '3a8b6b71a880d8b8152d3ad4c4ade2d3df3b0f5c'
and 'c06b8cca480ac664ddec99c4a2ab51b00f30240e'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sat, 22 Dec 2007 11:36:01 +0000 |
| parents | 3ef7dae7c804 (current diff) 6492a6ca4b03 (diff) |
| children | 76d025660d9e |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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; }