← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ibuscomponent.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:
src/ibuscomponent.c
21
21
 */
22
22
#include <glib/gstdio.h>
23
23
#include "ibuscomponent.h"
 
24
#include "ibusinternal.h"
24
25
 
25
26
enum {
26
27
    LAST_SIGNAL,
364
365
        g_variant_builder_add (array, "v", ibus_serializable_serialize ((IBusSerializable *)p->data));
365
366
    }
366
367
    g_variant_builder_add (builder, "av", array);
 
368
    g_variant_builder_unref (array);
367
369
 
368
370
    /* serialize engine desc list */
369
371
    array = g_variant_builder_new (G_VARIANT_TYPE ("av"));
371
373
        g_variant_builder_add (array, "v", ibus_serializable_serialize ((IBusSerializable *)p->data));
372
374
    }
373
375
    g_variant_builder_add (builder, "av", array);
 
376
    g_variant_builder_unref (array);
374
377
 
375
378
    return TRUE;
376
379
}
384
387
    retval = IBUS_SERIALIZABLE_CLASS (ibus_component_parent_class)->deserialize ((IBusSerializable *)component, variant);
385
388
    g_return_val_if_fail (retval, 0);
386
389
 
387
 
    g_variant_get_child (variant, retval++, "s", &component->priv->name);
388
 
    g_variant_get_child (variant, retval++, "s", &component->priv->description);
389
 
    g_variant_get_child (variant, retval++, "s", &component->priv->version);
390
 
    g_variant_get_child (variant, retval++, "s", &component->priv->license);
391
 
    g_variant_get_child (variant, retval++, "s", &component->priv->author);
392
 
    g_variant_get_child (variant, retval++, "s", &component->priv->homepage);
393
 
    g_variant_get_child (variant, retval++, "s", &component->priv->exec);
394
 
    g_variant_get_child (variant, retval++, "s", &component->priv->textdomain);
 
390
    ibus_g_variant_get_child_string (variant, retval++,
 
391
                                     &component->priv->name);
 
392
    ibus_g_variant_get_child_string (variant, retval++,
 
393
                                     &component->priv->description);
 
394
    ibus_g_variant_get_child_string (variant, retval++,
 
395
                                     &component->priv->version);
 
396
    ibus_g_variant_get_child_string (variant, retval++,
 
397
                                     &component->priv->license);
 
398
    ibus_g_variant_get_child_string (variant, retval++,
 
399
                                     &component->priv->author);
 
400
    ibus_g_variant_get_child_string (variant, retval++,
 
401
                                     &component->priv->homepage);
 
402
    ibus_g_variant_get_child_string (variant, retval++,
 
403
                                     &component->priv->exec);
 
404
    ibus_g_variant_get_child_string (variant, retval++,
 
405
                                     &component->priv->textdomain);
395
406
 
396
407
    GVariant *var;
397
408
    GVariantIter *iter = NULL;