From 50491822d6bc6738a5f565360b14a6913059b006 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 24 Jan 2012 11:06:19 +0900
Subject: [PATCH] Rename ibus_engine_new_type with ibus_engine_new_with_type.

seed assigns GType in IBus.Engine.type and also assignes "*_new_foo"
method in IBus.Engine.foo so renamed the function.

BUG=http://code.google.com/p/ibus/issues/detail?id=1397
TEST=Linux_desktop with seed and gjs

Review URL: https://codereview.appspot.com/5572046
---
 src/ibusengine.c  | 16 ++++++++--------
 src/ibusengine.h  |  6 +++---
 src/ibusfactory.c |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 96ed6a9..c0ad90b 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -1182,17 +1182,17 @@ 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);
diff --git a/src/ibusengine.h b/src/ibusengine.h
index 99d1d2a..ac56248 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -169,8 +169,8 @@ IBusEngine  *ibus_engine_new            (const gchar        *engine_name,
                                          const gchar        *object_path,
                                          GDBusConnection    *connection);
 /**
- * ibus_engine_new_type:
- * @engine_type: GType of subclass of IBUS_TYPE_ENGINE
+ * ibus_engine_new_with_type:
+ * @engine_type: GType of #IBusEngine.
  * @engine_name: Name of the IBusObject.
  * @object_path: Path for IBusService.
  * @connection: An opened GDBusConnection.
@@ -178,7 +178,7 @@ IBusEngine  *ibus_engine_new            (const gchar        *engine_name,
  *
  * New an IBusEngine.
  */
-IBusEngine  *ibus_engine_new_type       (GType               engine_type,
+IBusEngine  *ibus_engine_new_with_type  (GType               engine_type,
                                          const gchar        *engine_name,
                                          const gchar        *object_path,
                                          GDBusConnection    *connection);
diff --git a/src/ibusfactory.c b/src/ibusfactory.c
index f28f074..cdcf1a6 100644
--- a/src/ibusfactory.c
+++ b/src/ibusfactory.c
@@ -114,10 +114,10 @@ _ibus_factory_create_engine (IBusFactory    *factory,
 
     object_path = g_strdup_printf ("/org/freedesktop/IBus/Engine/%d",
                                    ++factory->priv->id);
-    engine = ibus_engine_new_type (engine_type,
-                                   engine_name,
-                                   object_path,
-                                   ibus_service_get_connection ((IBusService *)factory));
+    engine = ibus_engine_new_with_type (engine_type,
+                                        engine_name,
+                                        object_path,
+                                        ibus_service_get_connection ((IBusService *)factory));
     g_free (object_path);
 
     return engine;
-- 
2.7.4