Merge the devel branch

src/ibusengine.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 312 matching lines @@
      * Returns: TRUE for successfully process the key; FALSE otherwise.
      * See also:  ibus_input_context_process_key_event().
      *
      * <note><para>Argument @user_data is ignored in this function.</para></note>
      */
     engine_signals[PROCESS_KEY_EVENT] =
         g_signal_new (I_("process-key-event"),
             G_TYPE_FROM_CLASS (gobject_class),
             G_SIGNAL_RUN_LAST,
             G_STRUCT_OFFSET (IBusEngineClass, process_key_event),
-            NULL, NULL,
+            g_signal_accumulator_true_handled, NULL,
             _ibus_marshal_BOOL__UINT_UINT_UINT,
             G_TYPE_BOOLEAN,
             3,
             G_TYPE_UINT,
             G_TYPE_UINT,
             G_TYPE_UINT);
 
     /**
      * IBusEngine::focus-in:
      * @engine: An IBusEngine.
@@ skipping 827 matching lines @@
                               signal_name,
                               parameters,
                               NULL);
 }
 
 IBusEngine *
 ibus_engine_new (const gchar     *engine_name,
                  const gchar     *object_path,
                  GDBusConnection *connection)
 {
-    return ibus_engine_new_type (IBUS_TYPE_ENGINE,
-                                 engine_name,
-                                 object_path,
-                                 connection);
+    return ibus_engine_new_with_type (IBUS_TYPE_ENGINE,
+                                      engine_name,
+                                      object_path,
+                                      connection);
 }
 
 IBusEngine  *
-ibus_engine_new_type (GType            engine_type,
-                      const gchar     *engine_name,
-                      const gchar     *object_path,
-                      GDBusConnection *connection)
+ibus_engine_new_with_type (GType            engine_type,
+                           const gchar     *engine_name,
+                           const gchar     *object_path,
+                           GDBusConnection *connection)
 {
     g_return_val_if_fail (g_type_is_a (engine_type, IBUS_TYPE_ENGINE), NULL);
     g_return_val_if_fail (engine_name != NULL, NULL);
     g_return_val_if_fail (object_path != NULL, NULL);
     g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
 
     GObject *object = g_object_new (engine_type,
                                     "engine-name", engine_name,
                                     "object-path", object_path,
                                     "connection", connection,
@@ skipping 271 matching lines @@
 DEFINE_FUNC (show_lookup_table, ShowLookupTable)
 DEFINE_FUNC (hide_lookup_table, HideLookupTable)
 #undef DEFINE_FUNC
 
 const gchar *
 ibus_engine_get_name (IBusEngine *engine)
 {
     g_return_val_if_fail (IBUS_IS_ENGINE (engine), NULL);
     return engine->priv->engine_name;
 }