Merge the devel branch

src/ibusbus.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 /* ibus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
  * Copyright (C) 2008-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 1363 matching lines @@
                                  IBUS_INTERFACE_IBUS,
                                  active_engines_only ? "ListActiveEngines" : "ListEngines",
                                  NULL,
                                  G_VARIANT_TYPE ("(av)"));
 
     if (result) {
         GVariantIter *iter = NULL;
         g_variant_get (result, "(av)", &iter);
         GVariant *var;
         while (g_variant_iter_loop (iter, "v", &var)) {
-            retval = g_list_append (retval, ibus_serializable_deserialize (var));
+            IBusSerializable *serializable = ibus_serializable_deserialize (var);
+            g_object_ref_sink (serializable);

[Yusuke Sato, 2012/02/25 15:55:43]

Should we backport this fix to 1.4? If so, please do that (and patch Chromium OS
version of IBus as well :)

[Peng, 2012/02/26 21:52:14]

I think we should back port it.

+            retval = g_list_append (retval, serializable);
         }
         g_variant_iter_free (iter);
         g_variant_unref (result);
     }
 
     return retval;
 }
 
 GList *
 ibus_bus_list_engines (IBusBus *bus)
@@ skipping 33 matching lines @@
     if (g_simple_async_result_propagate_error (simple, error))
         return NULL;
     GVariant *variant = g_simple_async_result_get_op_res_gpointer (simple);
     g_return_val_if_fail (variant != NULL, NULL);
 
     GList *retval = NULL;
     GVariantIter *iter = NULL;
     g_variant_get (variant, "(av)", &iter);
     GVariant *var;
     while (g_variant_iter_loop (iter, "v", &var)) {
-        retval = g_list_append (retval, ibus_serializable_deserialize (var));
+        IBusSerializable *serializable = ibus_serializable_deserialize (var);
+        g_object_ref_sink (serializable);

[Yusuke Sato, 2012/02/25 15:55:43]

ditto

[Peng, 2012/02/26 21:52:14]

same

+        retval = g_list_append (retval, serializable);
     }
     g_variant_iter_free (iter);
     return retval;
 }
 
 GList *
 ibus_bus_list_active_engines (IBusBus *bus)
 {
     return ibus_bus_do_list_engines (bus, TRUE);
 }
@@ skipping 22 matching lines @@
 }
 
 GList *
 ibus_bus_list_active_engines_async_finish (IBusBus      *bus,
                                            GAsyncResult *res,
                                            GError      **error)
 {
     return ibus_bus_list_engines_async_finish (bus, res, error);
 }
 
+IBusEngineDesc **
+ibus_bus_get_engines_by_names (IBusBus             *bus,
+                               const gchar * const *names)
+{
+    g_return_val_if_fail (IBUS_IS_BUS (bus), NULL);
+
+    GVariant *result;
+    result = ibus_bus_call_sync (bus,
+                                 IBUS_SERVICE_IBUS,
+                                 IBUS_PATH_IBUS,
+                                 IBUS_INTERFACE_IBUS,
+                                 "GetEnginesByNames",
+                                 g_variant_new("(^as)", names),
+                                 G_VARIANT_TYPE ("(av)"));
+    if (result == NULL)
+        return NULL;
+····
+    GArray *array = g_array_new (TRUE, TRUE, sizeof (IBusEngineDesc *));
+    GVariantIter *iter = NULL;
+    g_variant_get (result, "(av)", &iter);
+    GVariant *var;
+    while (g_variant_iter_loop (iter, "v", &var)) {
+        IBusEngineDesc *desc = (IBusEngineDesc *) ibus_serializable_deserialize (var);
+        g_object_ref_sink (desc);
+        g_array_append_val (array, desc);
+    }
+    g_variant_iter_free (iter);
+    g_variant_unref (result);
+
+    return (IBusEngineDesc **)g_array_free (array, FALSE);
+}
+
 static void
 _config_destroy_cb (IBusConfig *config,
                     IBusBus    *bus)
 {
     IBusBusPrivate *priv;
     priv = IBUS_BUS_GET_PRIVATE (bus);
 
     g_assert (priv->config == config);
 
     g_object_unref (config);
@@ skipping 408 matching lines @@
                             interface,
                             member,
                             parameters,
                             reply_type,
                             G_DBUS_CALL_FLAGS_NO_AUTO_START,
                             timeout_msec,
                             cancellable,
                             (GAsyncReadyCallback) ibus_bus_call_async_done,
                             simple);
 }