pidgin/pidgin

Merge default branch
soc.2013.gobjectification.plugins
2014-01-26, Ankit Vani
cd01a433f676
Parents 5e205759b808e4c046cc8a77
Children 5606a81f48a8
Merge default branch
5 files changed, 6 insertions(+), 11 deletions(-)
  • +1 -7
    libpurple/protocols/jabber/caps.c
  • +2 -2
    libpurple/protocols/jabber/jabber.c
  • +1 -1
    libpurple/protocols/jabber/jutil.c
  • +1 -0
    libpurple/tests/check_libpurple.c
  • +1 -1
    libpurple/tests/test_oscar_util.c
    • --- a/libpurple/protocols/jabber/caps.c Sat Jan 25 20:11:23 2014 +0530
    +++ b/libpurple/protocols/jabber/caps.c Sun Jan 26 02:36:49 2014 +0530
    @@ -469,6 +469,7 @@
    hasher = purple_md5_hash_new();
    }
    hash = jabber_caps_calculate_hash(info, hasher);
    + g_object_unref(hasher);
    if (!hash || !g_str_equal(hash, userdata->ver)) {
    purple_debug_warning("jabber", "Could not validate caps info from "
    @@ -484,7 +485,6 @@
    }
    g_free(hash);
    - g_object_unref(hasher);
    }
    if (!userdata->hash && userdata->node_exts) {
    @@ -814,7 +814,6 @@
    append_escaped_string(PurpleHash *hash, const gchar *str)
    {
    g_return_if_fail(hash != NULL);
    - g_object_ref(hash);
    if (str && *str) {
    char *tmp = g_markup_escape_text(str, -1);
    @@ -823,7 +822,6 @@
    }
    purple_hash_append(hash, (const guchar *)"<", 1);
    - g_object_unref(hash);
    }
    gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, PurpleHash *hash)
    @@ -836,8 +834,6 @@
    if (!info || !hash)
    return NULL;
    - g_object_ref(hash);
    -
    /* sort identities, features and x-data forms */
    info->identities = g_list_sort(info->identities, jabber_identity_compare);
    info->features = g_list_sort(info->features, (GCompareFunc)strcmp);
    @@ -913,8 +909,6 @@
    success = purple_hash_digest(hash, checksum, checksum_size);
    checksum_size = purple_hash_get_digest_size(hash);
    - g_object_unref(hash);
    -
    return (success ? purple_base64_encode(checksum, checksum_size) : NULL);
    }
    --- a/libpurple/protocols/jabber/jabber.c Sat Jan 25 20:11:23 2014 +0530
    +++ b/libpurple/protocols/jabber/jabber.c Sun Jan 26 02:36:49 2014 +0530
    @@ -4078,12 +4078,12 @@
    purple_signal_register(protocol, "jabber-receiving-xmlnode",
    purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
    PURPLE_TYPE_CONNECTION,
    - G_TYPE_POINTER); /* modifiable PurpleXmlNode */
    + G_TYPE_POINTER); /* pointer to a PurpleXmlNode* */
    purple_signal_register(protocol, "jabber-sending-xmlnode",
    purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
    PURPLE_TYPE_CONNECTION,
    - G_TYPE_POINTER); /* modifiable PurpleXmlNode */
    + G_TYPE_POINTER); /* pointer to a PurpleXmlNode* */
    /*
    * Do not remove this or the plugin will fail. Completely. You have been
    --- a/libpurple/protocols/jabber/jutil.c Sat Jan 25 20:11:23 2014 +0530
    +++ b/libpurple/protocols/jabber/jutil.c Sun Jan 26 02:36:49 2014 +0530
    @@ -751,7 +751,7 @@
    if (hash == NULL)
    {
    - purple_debug_error("jabber", "Could not find %s cipher\n", hash_algo);
    + purple_debug_error("jabber", "Unexpected hashing algorithm %s requested\n", hash_algo);
    g_return_val_if_reached(NULL);
    }
    --- a/libpurple/tests/check_libpurple.c Sat Jan 25 20:11:23 2014 +0530
    +++ b/libpurple/tests/check_libpurple.c Sun Jan 26 02:36:49 2014 +0530
    @@ -28,6 +28,7 @@
    g_timeout_add_seconds,
    NULL,
    NULL,
    + NULL,
    NULL
    };
    --- a/libpurple/tests/test_oscar_util.c Sat Jan 25 20:11:23 2014 +0530
    +++ b/libpurple/tests/test_oscar_util.c Sun Jan 26 02:36:49 2014 +0530
    @@ -5,7 +5,7 @@
    START_TEST(test_oscar_util_name_compare)
    {
    - int i;
    + size_t i;
    const char *good[] = {
    "test",
    "TEST",