/pidgin/main: 4ac2ddeee1ca: Fix two more warnings

[Tomasz Wasilczyk]

Changeset: 4ac2ddeee1ca5b643ecfa8b6b26f34bc14a3b37f
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-03 20:30 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/4ac2ddeee1ca

Description:

Fix two more warnings

diffstat:

 finch/libgnt/gntmain.c      |  1 +
 libpurple/tests/test_trie.c |  5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff --git a/finch/libgnt/gntmain.c b/finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c
+++ b/finch/libgnt/gntmain.c
@@ -469,6 +469,7 @@ void gnt_init()
 
 #ifdef NO_WIDECHAR
 	ascii_only = TRUE;
+	(void)locale;
 #else
 	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf"))) {
 		ascii_only = FALSE;
diff --git a/libpurple/tests/test_trie.c b/libpurple/tests/test_trie.c
--- a/libpurple/tests/test_trie.c
+++ b/libpurple/tests/test_trie.c
@@ -8,10 +8,11 @@ test_trie_replace_cb(GString *out, const
 	gpointer user_data)
 {
 	/* the "test" word for the test_trie_replace test */
-	if ((int)word_data == 0x1001)
+	if ((gintptr)word_data == 0x1001)
 		return FALSE;
 
-	g_string_append_printf(out, "[%d:%x]", (int)user_data, (int)word_data);
+	g_string_append_printf(out, "[%d:%x]",
+		(int)(gintptr)user_data, (int)(gintptr)word_data);
 
 	return TRUE;
 }