Remove glib dependency from include/unit_control.h

Change-Id: I1289fbc4a2bc019b2f34d17f5dedfef292561c45
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/include/unit_control.h b/include/unit_control.h
index 116474631d4853f4e8d901557a9bcea6fac622bd..6efa69c55ee57b0acfe13c932cb1cc90d407f9df 100644 (file)
--- a/include/unit_control.h
+++ b/include/unit_control.h
@@ -1,23 +1,25 @@
 #ifndef UNIT_CONTROL_H
 #define UNIT_CONTROL_H
 
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
 enum {
        UNIT_CONTROL_OK,
        UNIT_CONTROL_ERROR,
 };
 
-typedef void (*actd_unit_cb)(int status, void *user_data, GError *err);
+typedef enum
+{
+       BUS_TYPE_SYSTEM  = 1,
+       BUS_TYPE_SESSION = 2
+} BusType;
+
+typedef void (*actd_unit_cb)(int status, void *user_data);
 
-int actd_start_unit(GBusType bus_type, const char *unit, int timeout);
-int actd_stop_unit(GBusType bus_type, const char *unit, int timeout);
-int actd_restart_unit(GBusType bus_type, const char *unit, int timeout);
+int actd_start_unit(BusType bus_type, const char *unit, int timeout);
+int actd_stop_unit(BusType bus_type, const char *unit, int timeout);
+int actd_restart_unit(BusType bus_type, const char *unit, int timeout);
 
-int actd_start_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
-int actd_stop_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
-int actd_restart_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
+int actd_start_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
+int actd_stop_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
+int actd_restart_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout);
 
 #endif /* UNIT_CONTROL_H */

diff --git a/src/libactd/unit_control.c b/src/libactd/unit_control.c
index 6496a01f1e8bcd50e7b226813c71e2ce703ee4de..e6c66b5de1f194292bd99bcdc701dd6bc60180d1 100644 (file)
--- a/src/libactd/unit_control.c
+++ b/src/libactd/unit_control.c
@@ -76,7 +76,7 @@ static void generic_callback(GObject *source_object, GAsyncResult *res, gpointer
                break;
        }
 
-       data->cb(status, data->user_data, err);
+       data->cb(status, data->user_data);
 
        if (err)
                g_error_free(err);
@@ -200,32 +200,32 @@ static int call_uc_async(GBusType bus_type, const char *method, const char *unit
        return 0;
 }
 
-int actd_start_unit(GBusType bus_type, const char *unit, int timeout)
+int actd_start_unit(BusType bus_type, const char *unit, int timeout)
 {
-       return call_uc(bus_type, "Start", unit, timeout);
+       return call_uc((GBusType)bus_type, "Start", unit, timeout);
 }
 
-int actd_stop_unit(GBusType bus_type, const char *unit, int timeout)
+int actd_stop_unit(BusType bus_type, const char *unit, int timeout)
 {
-       return call_uc(bus_type, "Stop", unit, timeout);
+       return call_uc((GBusType)bus_type, "Stop", unit, timeout);
 }
 
-int actd_restart_unit(GBusType bus_type, const char *unit, int timeout)
+int actd_restart_unit(BusType bus_type, const char *unit, int timeout)
 {
-       return call_uc(bus_type, "Restart", unit, timeout);
+       return call_uc((GBusType)bus_type, "Restart", unit, timeout);
 }
 
-int actd_start_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
+int actd_start_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
 {
-       return call_uc_async(bus_type, "Start", unit, cb, user_data, timeout);
+       return call_uc_async((GBusType)bus_type, "Start", unit, cb, user_data, timeout);
 }
 
-int actd_stop_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
+int actd_stop_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
 {
-       return call_uc_async(bus_type, "Stop", unit, cb, user_data, timeout);
+       return call_uc_async((GBusType)bus_type, "Stop", unit, cb, user_data, timeout);
 }
 
-int actd_restart_unit_async(GBusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
+int actd_restart_unit_async(BusType bus_type, const char *unit, actd_unit_cb cb, void *user_data, int timeout)
 {
-       return call_uc_async(bus_type, "Restart", unit, cb, user_data, timeout);
+       return call_uc_async((GBusType)bus_type, "Restart", unit, cb, user_data, timeout);
 }