← Back to branch summary

~ubuntu-branches/debian/sid/ibus/sid

« back to all changes in this revision

Viewing changes to conf/gconf/config.c

  • Committer: Package Import Robot
  • Author(s): Osamu Aoki, Aron Xu, Osamu Aoki
  • Date: 2014-08-04 22:42:19 UTC
  • mfrom: (1.5.7)
  • Revision ID: package-import@ubuntu.com-20140804224219-mjprlql1jdwi5sxm
Tags: 1.5.8-1
[ Aron Xu ]
* Allow parallel building

[ Osamu Aoki ]
* Update ibus document with Qt5 support

[ Aron Xu ]
* Imported Upstream version 1.5.8
* Remove patch for chasing HEAD, imported new upstream release
* Remove the patch for updating IBusKeymap jp, applied upstream
* Drop gtk2 version of the password patch because it's never executed
* Drop ibus-541492-xkb.patch
* Drop ibus-530711-preload-sys.patch
* Drop ibus-810211-no-switch-by-no-trigger.patch
* Drop 999-update-po.patch

[ Osamu Aoki ]
* linux-any for ibus-wayland
* Remove some symbols matching ibus-541492-xkb.patch
* Remove old patch for GTK+ 3.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
conf/gconf/config.c
290
290
    GVariant *variant = _from_gconf_value (gv);
291
291
    gconf_value_free (gv);
292
292
 
293
 
    return variant;
 
293
    return g_variant_ref_sink (variant);
294
294
}
295
295
 
296
296
static GVariant *
304
304
    g_free (dir);
305
305
 
306
306
    GSList *p;
307
 
    GVariantBuilder *builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
 
307
    GVariantBuilder *builder;
 
308
 
 
309
    g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
308
310
    for (p = entries; p != NULL; p = p->next) {
309
311
        GConfEntry *entry = (GConfEntry *)p->data;
310
312
        if (entry->key != NULL && entry->value != NULL) {
311
313
            const gchar *name = entry->key + len;
312
314
            GVariant *value = _from_gconf_value (entry->value);
313
 
            g_variant_builder_add (builder, "{sv}", name, value);
 
315
            g_variant_builder_add (&builder, "{sv}", name, value);
314
316
        }
315
317
        gconf_entry_free (entry);
316
318
    }
317
319
    g_slist_free (entries);
318
320
 
319
 
    return g_variant_builder_end (builder);
 
321
    return g_variant_builder_end (&builder);
320
322
}
321
323
 
322
324
static gboolean