/pidgin/main: 5986ee34c476: libpurple: Fix build and warnings wi...

[Ankit Vani]

Changeset: 5986ee34c476b166ba6a60a4ac08c628a585a08b
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-27 04:41 +0530
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/5986ee34c476

Description:

libpurple: Fix build and warnings with glib 2.24

diffstat:

 libpurple/ciphers/aescipher.c             |  3 ++-
 libpurple/glibcompat.h                    |  7 ++++++-
 libpurple/log.c                           |  2 +-
 libpurple/plugins/keyrings/gnomekeyring.c |  1 +
 libpurple/plugins/log_reader.c            |  1 +
 libpurple/protocols/gg/edisc.c            |  1 +
 libpurple/protocols/gg/message-prpl.c     |  1 +
 libpurple/protocols/msn/httpconn.c        |  1 +
 libpurple/protocols/silc/buddy.c          |  1 +
 libpurple/protocols/silc/pk.c             |  1 +
 libpurple/protocols/silc/util.c           |  1 +
 libpurple/request-datasheet.c             |  1 +
 libpurple/request.c                       |  1 +
 libpurple/util.c                          |  1 +
 14 files changed, 20 insertions(+), 3 deletions(-)

diffs (177 lines):

diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -362,7 +362,8 @@ purple_aes_cipher_nss_crypt(const guchar
 		return FALSE;
 	}
 
-	ret = PK11_CipherOp(context.enc_context, output, &outlen, len, input, len);
+	ret = PK11_CipherOp(context.enc_context, output, &outlen, len,
+			(guchar *)input, len);
 	if (ret != SECSuccess) {
 		purple_debug_error("cipher-aes",
 			"PK11_CipherOp failed: %d\n", PR_GetError());
diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -41,6 +41,9 @@
 
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 
+#include <glib.h>
+#include <glib-object.h>
+
 #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #define G_GNUC_END_IGNORE_DEPRECATIONS
 
@@ -75,6 +78,8 @@ static inline void g_slist_free_full(GSL
 
 #if !GLIB_CHECK_VERSION(2, 26, 0)
 
+typedef struct stat GStatBuf;
+
 static inline void g_object_notify_by_pspec(GObject *object, GParamSpec *pspec)
 {
 	g_object_notify(object, g_param_spec_get_name(pspec));
@@ -83,7 +88,7 @@ static inline void g_object_notify_by_ps
 static inline void g_object_class_install_properties(GObjectClass *oclass,
 	guint n_pspecs, GParamSpec **pspecs)
 {
-	gint i;
+	guint i;
 	for (i = 1; i < n_pspecs; ++i)
 		g_object_class_install_property(oclass, i, pspecs[i]);
 }
diff --git a/libpurple/log.c b/libpurple/log.c
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -28,7 +28,7 @@
 #include "account.h"
 #include "dbus-maybe.h"
 #include "debug.h"
-#include "internal.h"
+#include "glibcompat.h"
 #include "log.h"
 #include "prefs.h"
 #include "util.h"
diff --git a/libpurple/plugins/keyrings/gnomekeyring.c b/libpurple/plugins/keyrings/gnomekeyring.c
--- a/libpurple/plugins/keyrings/gnomekeyring.c
+++ b/libpurple/plugins/keyrings/gnomekeyring.c
@@ -27,6 +27,7 @@
 #include "internal.h"
 #include "account.h"
 #include "debug.h"
+#include "glibcompat.h"
 #include "keyring.h"
 #include "plugin.h"
 #include "version.h"
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 
 #include "debug.h"
+#include "glibcompat.h"
 #include "log.h"
 #include "plugin.h"
 #include "pluginpref.h"
diff --git a/libpurple/protocols/gg/edisc.c b/libpurple/protocols/gg/edisc.c
--- a/libpurple/protocols/gg/edisc.c
+++ b/libpurple/protocols/gg/edisc.c
@@ -1,6 +1,7 @@
 #include "edisc.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #include "gg.h"
 #include "libgaduw.h"
diff --git a/libpurple/protocols/gg/message-prpl.c b/libpurple/protocols/gg/message-prpl.c
--- a/libpurple/protocols/gg/message-prpl.c
+++ b/libpurple/protocols/gg/message-prpl.c
@@ -1,6 +1,7 @@
 #include "message-prpl.h"
 
 #include <debug.h>
+#include <glibcompat.h>
 
 #include "gg.h"
 #include "chat.h"
diff --git a/libpurple/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
--- a/libpurple/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
@@ -25,6 +25,7 @@
 #include "httpconn.h"
 
 #include "debug.h"
+#include "glibcompat.h"
 #include "http.h"
 
 #include "msn.h"
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -18,6 +18,7 @@
 */
 
 #include "internal.h"
+#include "glibcompat.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/pk.c b/libpurple/protocols/silc/pk.c
--- a/libpurple/protocols/silc/pk.c
+++ b/libpurple/protocols/silc/pk.c
@@ -18,6 +18,7 @@
 */
 
 #include "internal.h"
+#include "glibcompat.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/protocols/silc/util.c b/libpurple/protocols/silc/util.c
--- a/libpurple/protocols/silc/util.c
+++ b/libpurple/protocols/silc/util.c
@@ -18,6 +18,7 @@
 */
 
 #include "internal.h"
+#include "glibcompat.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
diff --git a/libpurple/request-datasheet.c b/libpurple/request-datasheet.c
--- a/libpurple/request-datasheet.c
+++ b/libpurple/request-datasheet.c
@@ -27,6 +27,7 @@
 #include "request-datasheet.h"
 
 #include "debug.h"
+#include "glibcompat.h"
 #include "signals.h"
 
 struct _PurpleRequestDatasheet
diff --git a/libpurple/request.c b/libpurple/request.c
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -27,6 +27,7 @@
 
 #include "internal.h"
 
+#include "glibcompat.h"
 #include "notify.h"
 #include "request.h"
 #include "debug.h"
diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -27,6 +27,7 @@
 #include "conversation.h"
 #include "core.h"
 #include "debug.h"
+#include "glibcompat.h"
 #include "notify.h"
 #include "prpl.h"
 #include "prefs.h"