Create PROPERTY_* signals correctly and refine coding style.

diff --git a/src/ibusengine.c b/src/ibusengine.c
index 0c36dd46520cb57d9ce9761c390beddd91a0cbbe..47cfeb060d58f3b985d103fa7773433810ecc2ea 100644 (file)
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -227,7 +227,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, focus_in),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[FOCUS_OUT] =
         g_signal_new (I_("focus-out"),
@@ -236,7 +237,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, focus_out),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[RESET] =
         g_signal_new (I_("reset"),
@@ -245,7 +247,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, reset),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[ENABLE] =
         g_signal_new (I_("enable"),
@@ -254,7 +257,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, enable),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[DISABLE] =
         g_signal_new (I_("disable"),
@@ -263,7 +267,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, disable),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[SET_CURSOR_LOCATION] =
         g_signal_new (I_("set-cursor-location"),
@@ -272,8 +277,12 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, set_cursor_location),
             NULL, NULL,
             ibus_marshal_VOID__INT_INT_INT_INT,
-            G_TYPE_NONE, 4,
-            G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+            G_TYPE_NONE,
+            4,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT,
+            G_TYPE_INT);
 
     engine_signals[SET_CAPABILITIES] =
         g_signal_new (I_("set-capabilities"),
@@ -282,7 +291,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, set_capabilities),
             NULL, NULL,
             ibus_marshal_VOID__UINT,
-            G_TYPE_NONE, 1,
+            G_TYPE_NONE,
+            1,
             G_TYPE_UINT);
 
     engine_signals[PAGE_UP] =
@@ -292,7 +302,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, page_up),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[PAGE_DOWN] =
         g_signal_new (I_("page-down"),
@@ -301,7 +312,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, page_down),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[CURSOR_UP] =
         g_signal_new (I_("cursor-up"),
@@ -310,7 +322,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, cursor_up),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[CURSOR_DOWN] =
         g_signal_new (I_("cursor-down"),
@@ -319,7 +332,8 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, cursor_down),
             NULL, NULL,
             ibus_marshal_VOID__VOID,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            0);
 
     engine_signals[PROPERTY_ACTIVATE] =
         g_signal_new (I_("property-activate"),
@@ -328,7 +342,10 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, property_activate),
             NULL, NULL,
             ibus_marshal_VOID__STRING_INT,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            2,
+            G_TYPE_STRING,
+            G_TYPE_INT);
 
     engine_signals[PROPERTY_SHOW] =
         g_signal_new (I_("property-show"),
@@ -337,7 +354,9 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, property_show),
             NULL, NULL,
             ibus_marshal_VOID__STRING,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            1,
+            G_TYPE_STRING);
 
     engine_signals[PROPERTY_HIDE] =
         g_signal_new (I_("property-hide"),
@@ -346,7 +365,9 @@ ibus_engine_class_init (IBusEngineClass *klass)
             G_STRUCT_OFFSET (IBusEngineClass, property_hide),
             NULL, NULL,
             ibus_marshal_VOID__STRING,
-            G_TYPE_NONE, 0);
+            G_TYPE_NONE,
+            1,
+            G_TYPE_STRING);
 
 }