/soc/2013/ankitkv/gobjectification: da82f59c6787: Merged default...

[Ankit Vani]

Changeset: da82f59c67871b165e96a1fb278e1db9ce7eaff5
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-29 05:30 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/da82f59c6787

Description:

Merged default branch

diffstat:

 libpurple/glibcompat.h                 |  4 ++--
 libpurple/protocols/oscar/family_icq.c |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (38 lines):

diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -39,11 +39,11 @@
 #endif /* __clang__ */
 
 
+#include <glib.h>
+
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 
-#include <glib.h>
 #include <glib-object.h>
-
 #include <string.h>
 
 #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
diff --git a/libpurple/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
--- a/libpurple/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
@@ -23,6 +23,8 @@
  *
  */
 
+#include "glibcompat.h"
+
 #include "encoding.h"
 #include "oscar.h"
 
@@ -771,7 +773,7 @@ snachandler(OscarData *od, FlapConnectio
 static void
 icq_shutdown(OscarData *od, aim_module_t *mod)
 {
-	g_slist_free_full(od->icq_info, aim_icq_freeinfo);
+	g_slist_free_full(od->icq_info, (GDestroyNotify)aim_icq_freeinfo);
 }
 
 int