/pidgin/main: f7d395700c8b: Backport more warning fixes for libp...

[Tomasz Wasilczyk]

Changeset: f7d395700c8b627f731c82ca195f365bf0f38cb7
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-06 15:05 +0200
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/f7d395700c8b

Description:

Backport more warning fixes for libpurple from default

diffstat:

 libpurple/account.c                          |  6 +++---
 libpurple/core.c                             |  3 +++
 libpurple/plugins/perl/common/Certificate.xs |  1 -
 libpurple/proxy.c                            |  1 +
 libpurple/purple-client.c                    |  5 ++++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diffs (67 lines):

diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -396,9 +396,9 @@ account_to_xmlnode(PurpleAccount *accoun
 		child = xmlnode_new_child(node, "password");
 		xmlnode_insert_data(child, tmp, -1);
 	} else if (_purple_account_is_password_encrypted(account)) {
-		const char *keyring;
-		const char *mode;
-		const char *ciphertext;
+		const char *keyring = NULL;
+		const char *mode = NULL;
+		const char *ciphertext = NULL;
 		gboolean success;
 
 		purple_debug_warning("account", "saving libpurple3-compatible "
diff --git a/libpurple/core.c b/libpurple/core.c
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -91,7 +91,10 @@ purple_core_init(const char *ui)
 	wpurple_init();
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+	/* GLib type system is automaticaly initialized since 2.36. */
 	g_type_init();
+#endif
 
 	_core = core = g_new0(PurpleCore, 1);
 	core->ui = g_strdup(ui);
diff --git a/libpurple/plugins/perl/common/Certificate.xs b/libpurple/plugins/perl/common/Certificate.xs
--- a/libpurple/plugins/perl/common/Certificate.xs
+++ b/libpurple/plugins/perl/common/Certificate.xs
@@ -224,7 +224,6 @@ purple_certificate_verify(verifier, subj
 	Purple::Certificate::Verifier verifier
 	const gchar* subject_name
 	AV* cert_chain
-	CV *cb
 	SV *cb_data
 	PREINIT:
 		GList *l = NULL;
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -977,6 +977,7 @@ http_canread(gpointer data, gint source,
 				p++;
 				status = strtol(p, &p, 10);
 				error = (*p != ' ');
+				(void)minor; /* we don't need its value */
 			}
 		}
 	}
diff --git a/libpurple/purple-client.c b/libpurple/purple-client.c
--- a/libpurple/purple-client.c
+++ b/libpurple/purple-client.c
@@ -66,7 +66,10 @@ void purple_init(void)
 {
 	GError *error = NULL;
 
-	g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+	/* GLib type system is automaticaly initialized since 2.36. */
+	g_type_init();
+#endif
 
 	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (!bus)