← Back to branch summary

~online-accounts/libaccounts-qt/trunk

« back to all changes in this revision

Viewing changes to Accounts/utils.cpp

  • Committer: CI Train Bot
  • Author(s): Alberto Mardegan
  • Date: 2015-11-02 09:12:27 UTC
  • mfrom: (143.1.5 packaging)
  • Revision ID: ci-train-bot@canonical.com-20151102091227-725gswuwzt9azsja
New upstream release.

- Use gboolean instead of bool to g_object_get (fixes a stack corruption)
- Headers: remove unnecessary semicolon after namespace
- Docs: fix hint on destruction of Account and Service
- Fix memory leaks found by valgrind
  Fixes: https://code.google.com/p/accounts-sso/issues/detail?id=239
- Tests: make using a wrapper easier
  Tests can now be run with a command like:
    make check WRAPPER="valgrind --leak-check=full"

Show diffs side-by-side

added added

removed removed

Lines of Context:
Accounts/utils.cpp
32
32
{
33
33
    QVariantMap ret;
34
34
    GVariantIter iter;
35
 
    const gchar *key;
 
35
    gchar *key;
36
36
    GVariant *value;
37
37
 
38
38
    g_variant_iter_init (&iter, variant);
39
39
    while (g_variant_iter_next (&iter, "{sv}", &key, &value)) {
40
40
        ret.insert(UTF8(key), gVariantToQVariant(value));
 
41
        g_variant_unref(value);
 
42
        g_free(key);
41
43
    }
42
44
 
43
45
    return ret;
60
62
 
61
63
    gsize length;
62
64
    const gchar **strings = g_variant_get_strv(variant, &length);
 
65
    ret.reserve(length);
63
66
    for (gsize i = 0; i < length; i++) {
64
67
        ret.append(UTF8(strings[i]));
65
68
    }