Fix init/shutdown process in wkb-ibus and wkb-ibus-test

[profile/ivi/weekeyboard.git] / src / wkb-ibus-test.c

diff --git a/src/wkb-ibus-test.c b/src/wkb-ibus-test.c
index ced4700..ec7d7a3 100644 (file)
--- a/src/wkb-ibus-test.c
+++ b/src/wkb-ibus-test.c
@@ -15,17 +15,20 @@
  */
 
 #include "wkb-ibus.h"
+#include "wkb-log.h"
 
 #define _GNU_SOURCE
 #include <signal.h>
 
+#include <Eina.h>
 #include <Ecore.h>
 #include <Eldbus.h>
+#include <Efreet.h>
 
 static void
 _finish(int foo)
 {
-   printf("FINISH\n");
+   ERR("FINISH\n");
    wkb_ibus_shutdown();
 }
 
@@ -38,22 +41,21 @@ _connect_timer(void *data)
 int
 main (int argc, char *argv[])
 {
-   if (!ecore_init())
-     {
-        printf("Error initializing ecore");
-        return 1;
-     }
+   int ret = 1;
+
+   if (!wkb_log_init("ibus-test"))
+      return 1;
 
-   if (!eldbus_init())
+   if (!ecore_init())
      {
-        printf("Error initializing eldbus");
-        return 1;
+        ERR("Error initializing ecore");
+        goto ecore_err;
      }
 
    if (!wkb_ibus_init())
      {
-        printf("Error initializing ibus");
-        return 1;
+        ERR("Error initializing ibus");
+        goto end;
      }
 
    ecore_timer_add(1, _connect_timer, NULL);
@@ -62,8 +64,13 @@ main (int argc, char *argv[])
    signal(SIGINT, _finish);
 
    ecore_main_loop_begin();
+   ret = 0;
 
-   eldbus_shutdown();
+end:
    ecore_shutdown();
-   return 0;
+
+ecore_err:
+   wkb_log_shutdown();
+
+   return ret;
 }