pidgin/pidgin

Merged default branch
soc.2013.gobjectification.plugins
2014-01-29, Ankit Vani
da82f59c6787
Parents 9b6661893d926f0178580d5d
Children 03730619fbac
Merged default branch
2 files changed, 5 insertions(+), 3 deletions(-)
  • +2 -2
    libpurple/glibcompat.h
  • +3 -1
    libpurple/protocols/oscar/family_icq.c
    • --- a/libpurple/glibcompat.h Wed Jan 29 05:29:11 2014 +0530
    +++ b/libpurple/glibcompat.h Wed Jan 29 05:30:54 2014 +0530
    @@ -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
    --- a/libpurple/protocols/oscar/family_icq.c Wed Jan 29 05:29:11 2014 +0530
    +++ b/libpurple/protocols/oscar/family_icq.c Wed Jan 29 05:30:54 2014 +0530
    @@ -23,6 +23,8 @@
    *
    */
    +#include "glibcompat.h"
    +
    #include "encoding.h"
    #include "oscar.h"
    @@ -771,7 +773,7 @@
    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