Change libgdbus library name to libsyscommon.

Call common check_system_boot_finished function, instaed of local implement.

Change-Id: Iafec48599499be4263e9e6383e8bdfc21ded0e87
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472aebe..151bf1b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ SET(PKG_MODULES
        capi-system-info
        capi-system-device
        libsystemd
-       libgdbus
+       libsyscommon
 )
 
 IF(DISPLAY_MODULE STREQUAL on)

diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index a08c88a..52e7605 100644 (file)
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -35,7 +35,7 @@ BuildRequires:        pkgconfig(fuse)
 BuildRequires: pkgconfig(minizip)
 BuildRequires: pkgconfig(libkmod)
 BuildRequires: pkgconfig(libusbgx)
-BuildRequires: pkgconfig(libgdbus)
+BuildRequires: pkgconfig(libsyscommon)
 BuildRequires: pkgconfig(capi-system-device)
 
 Requires: %{name}-tools = %{version}-%{release}

diff --git a/plugins/iot/display/ambient-mode.c b/plugins/iot/display/ambient-mode.c
index 72ce1a2..bf673cd 100644 (file)
--- a/plugins/iot/display/ambient-mode.c
+++ b/plugins/iot/display/ambient-mode.c
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "util.h"
 #include "core.h"

diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c
index b3b3885..1ac619c 100755 (executable)
--- a/plugins/iot/display/core.c
+++ b/plugins/iot/display/core.c
@@ -38,7 +38,7 @@
 #include <vconf-keys.h>
 #include <sys/time.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/iot/display/display-dbus.c b/plugins/iot/display/display-dbus.c
index d99a4fb..1f6ec2a 100644 (file)
--- a/plugins/iot/display/display-dbus.c
+++ b/plugins/iot/display/display-dbus.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <device-node.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "core/log.h"

diff --git a/plugins/iot/display/dpms-wayland-none.c b/plugins/iot/display/dpms-wayland-none.c
index cf1db2e..919c144 100644 (file)
--- a/plugins/iot/display/dpms-wayland-none.c
+++ b/plugins/iot/display/dpms-wayland-none.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "device-interface.h"
 #include "util.h"

diff --git a/plugins/iot/display/key-filter.c b/plugins/iot/display/key-filter.c
index ce14ce2..cf6cfa7 100644 (file)
--- a/plugins/iot/display/key-filter.c
+++ b/plugins/iot/display/key-filter.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/mobile/display/ambient-mode.c b/plugins/mobile/display/ambient-mode.c
index 72ce1a2..bf673cd 100755 (executable)
--- a/plugins/mobile/display/ambient-mode.c
+++ b/plugins/mobile/display/ambient-mode.c
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "util.h"
 #include "core.h"

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index b3b3885..1ac619c 100755 (executable)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -38,7 +38,7 @@
 #include <vconf-keys.h>
 #include <sys/time.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/mobile/display/display-dbus.c b/plugins/mobile/display/display-dbus.c
index d99a4fb..1f6ec2a 100644 (file)
--- a/plugins/mobile/display/display-dbus.c
+++ b/plugins/mobile/display/display-dbus.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <device-node.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "core/log.h"

diff --git a/plugins/mobile/display/dpms-wayland-none.c b/plugins/mobile/display/dpms-wayland-none.c
index cf1db2e..919c144 100644 (file)
--- a/plugins/mobile/display/dpms-wayland-none.c
+++ b/plugins/mobile/display/dpms-wayland-none.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "device-interface.h"
 #include "util.h"

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index ce14ce2..cf6cfa7 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/tv/display/ambient-mode.c b/plugins/tv/display/ambient-mode.c
index 72ce1a2..bf673cd 100755 (executable)
--- a/plugins/tv/display/ambient-mode.c
+++ b/plugins/tv/display/ambient-mode.c
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "util.h"
 #include "core.h"

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index d0a28ad..8010dce 100755 (executable)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -38,7 +38,7 @@
 #include <vconf-keys.h>
 #include <sys/time.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/tv/display/display-dbus.c b/plugins/tv/display/display-dbus.c
index d99a4fb..1f6ec2a 100644 (file)
--- a/plugins/tv/display/display-dbus.c
+++ b/plugins/tv/display/display-dbus.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <device-node.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "core/log.h"

diff --git a/plugins/tv/display/dpms-wayland-none.c b/plugins/tv/display/dpms-wayland-none.c
index cf1db2e..919c144 100644 (file)
--- a/plugins/tv/display/dpms-wayland-none.c
+++ b/plugins/tv/display/dpms-wayland-none.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "device-interface.h"
 #include "util.h"

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index ce14ce2..cf6cfa7 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/wearable/display/ambient-mode.c b/plugins/wearable/display/ambient-mode.c
index 72ce1a2..bf673cd 100755 (executable)
--- a/plugins/wearable/display/ambient-mode.c
+++ b/plugins/wearable/display/ambient-mode.c
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "util.h"
 #include "core.h"

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index a00965b..2351b48 100755 (executable)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -38,7 +38,7 @@
 #include <vconf-keys.h>
 #include <sys/time.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/wearable/display/display-dbus.c b/plugins/wearable/display/display-dbus.c
index d99a4fb..1f6ec2a 100644 (file)
--- a/plugins/wearable/display/display-dbus.c
+++ b/plugins/wearable/display/display-dbus.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <device-node.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "core/log.h"

diff --git a/plugins/wearable/display/dpms-wayland-none.c b/plugins/wearable/display/dpms-wayland-none.c
index cf1db2e..919c144 100644 (file)
--- a/plugins/wearable/display/dpms-wayland-none.c
+++ b/plugins/wearable/display/dpms-wayland-none.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "device-interface.h"
 #include "util.h"

diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c
index 5d26c2e..bb566c5 100644 (file)
--- a/plugins/wearable/display/enhance.c
+++ b/plugins/wearable/display/enhance.c
@@ -22,7 +22,7 @@
 #include <device-node.h>
 #include <vconf.h>
 #include <hw/display.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "display/core.h"
 #include "display/display-ops.h"

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index 7130f52..051a12d 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "ambient-mode.h"
 #include "util.h"

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index 378906e..3c98ed3 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -23,7 +23,7 @@
 #include "display/core.h"
 #include "display/util.h"
 #include "display/display-ops.h"
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 /* CoreApps */
 #define COREAPPS_PATH_HOME                      "/Org/Tizen/Coreapps/home"

diff --git a/src/apps/apps.h b/src/apps/apps.h
index 9f62771..dc11d92 100644 (file)
--- a/src/apps/apps.h
+++ b/src/apps/apps.h
@@ -20,7 +20,7 @@
 #define __APPS_H__
 
 #include <string.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 #include "core/common.h"
 #include "display/poll.h"
 

diff --git a/src/auto-test/test.h b/src/auto-test/test.h
index d755d3a..b324511 100644 (file)
--- a/src/auto-test/test.h
+++ b/src/auto-test/test.h
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/list.h"
 #include "core/common.h"

diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c
index 70d84a5..898796b 100644 (file)
--- a/src/battery/battery-time.c
+++ b/src/battery/battery-time.c
@@ -23,7 +23,7 @@
 #include <vconf.h>
 #include <device-node.h>
 #include <hw/battery.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/common.h"
 #include "core/devices.h"

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index f54023d..e88cf07 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -25,7 +25,7 @@
 #include <bundle.h>
 #include <eventsystem.h>
 #include <hw/battery.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "lowbat-handler.h"
 #include "battery.h"

diff --git a/src/control/control.c b/src/control/control.c
index a2cd0e7..d410134 100644 (file)
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <sys/types.h>
 #include <dd-control.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/common.h"

diff --git a/src/core/device-notifier.c b/src/core/device-notifier.c
index c61c583..6da2212 100644 (file)
--- a/src/core/device-notifier.c
+++ b/src/core/device-notifier.c
@@ -22,7 +22,7 @@
 #include "list.h"
 #include "common.h"
 #include "core/devices.h"
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 struct device_notifier {
        bool deleted;

diff --git a/src/core/devices.c b/src/core/devices.c
index 526fd92..e19f524 100644 (file)
--- a/src/core/devices.c
+++ b/src/core/devices.c
@@ -18,7 +18,7 @@
 
 
 #include <stdio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "list.h"

diff --git a/src/core/event-handler.c b/src/core/event-handler.c
index 9f819fd..844ceea 100644 (file)
--- a/src/core/event-handler.c
+++ b/src/core/event-handler.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "common.h"
 #include "devices.h"

diff --git a/src/core/main.c b/src/core/main.c
index fae033b..5c80542 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -22,7 +22,8 @@
 #include <sys/reboot.h>
 #include <systemd/sd-daemon.h>
 #include <glib.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/systemd-state.h>
 
 #include "display/core.h"
 #include "log.h"
@@ -69,7 +70,7 @@ void watchdog_notify(void)
 static void deviced_dbus_name_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data)
 {
        int ret;
-       ret = check_booting_finished();
+       ret = check_system_boot_finished();
        if (ret == 1) {
                /* Restarted: deviced was terminated */
                _I("Notify relaunch.");

diff --git a/src/core/udev.c b/src/core/udev.c
index d9e2e7c..edb630e 100644 (file)
--- a/src/core/udev.c
+++ b/src/core/udev.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "device-notifier.h"

diff --git a/src/cpu/pmqos-plugin.c b/src/cpu/pmqos-plugin.c
index be46494..3113da5 100644 (file)
--- a/src/cpu/pmqos-plugin.c
+++ b/src/cpu/pmqos-plugin.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/config-parser.h"

diff --git a/src/cpu/pmqos.c b/src/cpu/pmqos.c
index af9a681..49b93ee 100644 (file)
--- a/src/cpu/pmqos.c
+++ b/src/cpu/pmqos.c
@@ -24,7 +24,7 @@
 #include <device-node.h>
 #include <glib.h>
 #include <hw/cpu.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/devicectl/CMakeLists.txt b/src/devicectl/CMakeLists.txt
index 04f543b..59c5851 100644 (file)
--- a/src/devicectl/CMakeLists.txt
+++ b/src/devicectl/CMakeLists.txt
@@ -16,7 +16,7 @@ pkg_check_modules(pkgs REQUIRED
                glib-2.0
                gio-2.0
                gio-unix-2.0
-               libgdbus)
+               libsyscommon)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/src/devicectl/devicectl.c b/src/devicectl/devicectl.c
index 04d5093..2f3da14 100644 (file)
--- a/src/devicectl/devicectl.c
+++ b/src/devicectl/devicectl.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 #include <core/common.h>
 #include "usb.h"
 

diff --git a/src/display/poll.h b/src/display/poll.h
index f6ab3c6..736e20f 100644 (file)
--- a/src/display/poll.h
+++ b/src/display/poll.h
@@ -27,7 +27,7 @@
 #define __PM_POLL_H__
 
 
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 /**
  * @addtogroup POWER_MANAGER
  * @{

diff --git a/src/dump/dump.c b/src/dump/dump.c
index b89ecc2..c082fda 100644 (file)
--- a/src/dump/dump.c
+++ b/src/dump/dump.c
@@ -24,7 +24,7 @@
 #include "core/list.h"
 #include "core/common.h"
 #include "core/devices.h"
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #define SERVICE_NAME           "deviced"
 #define DUMP_SIGNAL            "Dump"

diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c
index f212081..b287864 100644 (file)
--- a/src/extcon/cradle.c
+++ b/src/extcon/cradle.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <vconf.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/device-notifier.h"

diff --git a/src/extcon/extcon.c b/src/extcon/extcon.c
index 881e355..3afb4ce 100644 (file)
--- a/src/extcon/extcon.c
+++ b/src/extcon/extcon.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <hw/external_connection.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/list.h"

diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c
index cc6e747..c70cbdc 100644 (file)
--- a/src/extcon/hdmi.c
+++ b/src/extcon/hdmi.c
@@ -18,7 +18,7 @@
 
 
 #include <vconf.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 #include "core/log.h"
 #include "core/device-notifier.h"
 #include "display/core.h"

diff --git a/src/ir/ir.c b/src/ir/ir.c
index 7197411..2b8d37d 100644 (file)
--- a/src/ir/ir.c
+++ b/src/ir/ir.c
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <hw/ir.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 #include "core/devices.h"
 #include "core/common.h"
 #include "core/log.h"

diff --git a/src/led/noti.c b/src/led/noti.c
index 522cf99..faa5b04 100644 (file)
--- a/src/led/noti.c
+++ b/src/led/noti.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 

diff --git a/src/led/rgb.c b/src/led/rgb.c
index 59fb9f5..5b115da 100644 (file)
--- a/src/led/rgb.c
+++ b/src/led/rgb.c
@@ -25,7 +25,7 @@
 
 #include <vconf.h>
 #include <hw/led.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/list.h"

diff --git a/src/led/torch.c b/src/led/torch.c
index 0d9e887..71d329f 100644 (file)
--- a/src/led/torch.c
+++ b/src/led/torch.c
@@ -23,7 +23,7 @@
 #include <vconf.h>
 #include <device-node.h>
 #include <hw/led.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/led/touch-key.c b/src/led/touch-key.c
index 0f1ac2f..8c7e517 100644 (file)
--- a/src/led/touch-key.c
+++ b/src/led/touch-key.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <vconf.h>
 #include <hw/led.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/libdeviced/CMakeLists.txt b/src/libdeviced/CMakeLists.txt
index b0b9093..c2ef9e1 100644 (file)
--- a/src/libdeviced/CMakeLists.txt
+++ b/src/libdeviced/CMakeLists.txt
@@ -18,7 +18,7 @@ pkg_check_modules(libpkgs REQUIRED
        dlog
        glib-2.0
        gio-2.0
-       libgdbus
+       libsyscommon
        gio-unix-2.0)
 
 FOREACH(flag ${libpkgs_CFLAGS})

diff --git a/src/libdeviced/deviced-noti.c b/src/libdeviced/deviced-noti.c
index c244a15..fa371ee 100644 (file)
--- a/src/libdeviced/deviced-noti.c
+++ b/src/libdeviced/deviced-noti.c
@@ -27,7 +27,7 @@
 #include <vconf.h>
 #include <vconf-keys.h>
 #include <limits.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "dd-deviced.h"
 #include "deviced-priv.h"

diff --git a/src/libdeviced/display.c b/src/libdeviced/display.c
index 4f3eebd..5985d82 100644 (file)
--- a/src/libdeviced/display.c
+++ b/src/libdeviced/display.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "common.h"

diff --git a/src/libdeviced/haptic.c b/src/libdeviced/haptic.c
index 9fc789c..d935aa5 100644 (file)
--- a/src/libdeviced/haptic.c
+++ b/src/libdeviced/haptic.c
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 #include <vconf.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "dd-haptic.h"

diff --git a/src/libdeviced/led.c b/src/libdeviced/led.c
index dd93631..85537b2 100644 (file)
--- a/src/libdeviced/led.c
+++ b/src/libdeviced/led.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "common.h"

diff --git a/src/libdeviced/usbhost.c b/src/libdeviced/usbhost.c
index 94396bf..3fb1f18 100644 (file)
--- a/src/libdeviced/usbhost.c
+++ b/src/libdeviced/usbhost.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "log.h"
 #include "common.h"

diff --git a/src/power/boot.c b/src/power/boot.c
index 530fe8e..87ff7ce 100644 (file)
--- a/src/power/boot.c
+++ b/src/power/boot.c
@@ -20,8 +20,9 @@
 #include <unistd.h>
 #include <bundle.h>
 #include <eventsystem.h>
-#include <libgdbus/dbus-system.h>
-#include <libgdbus/dbus-systemd.h>
+#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/dbus-systemd.h>
+#include <libsyscommon/systemd-state.h>
 
 #include "core/log.h"
 #include "core/device-notifier.h"
@@ -32,43 +33,6 @@
 #define SIGNAL_BOOTING_DONE                             "BootingDone"
 #define SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED     "StartupFinished"
 #define SYSTEMD_DBUS_SIGNAL_USER_STARTUP_FINISHED       "UserSessionStartupFinished"
-#define SYSTEMD_DBUS_METHOD_SYSTEM_STATE                "SystemState"
-#define SYSTEMD_STATE_RUNNING                           "running"
-#define SYSTEMD_STATE_DEGRADED                          "degraded"
-
-int check_booting_finished(void)
-{
-       char *state = NULL;
-       int ret = 0;
-       size_t len;
-       GVariant *reply = NULL;
-
-       reply = systemd_get_manager_property(SYSTEMD_DBUS_METHOD_SYSTEM_STATE);
-       if (!reply) {
-               _E("Failed to get system state: No reply");
-               goto err;
-       }
-       if (!dh_get_param_from_var(reply, "s", &state)) {
-               _E("Failed to get system state(%s)", g_variant_get_type_string(reply));
-               goto err;
-       }
-
-       _I("System state=%s", state);
-
-       len = strlen(state) + 1;
-       if (!strncmp(state, SYSTEMD_STATE_RUNNING, len) ||
-               !strncmp(state, SYSTEMD_STATE_DEGRADED, len))
-               ret = 1;
-       else
-               ret = 0;
-
-err:
-       if (reply)
-               g_variant_unref(reply);
-       free(state);
-
-       return ret;
-}
 
 static guint sig_id[2] = {0, 0};
 
@@ -93,7 +57,7 @@ static void booting_done_received(GDBusConnection  *conn,
                if (system_done)
                        return;
 
-               system_done = check_booting_finished();
+               system_done = check_system_boot_finished();
                if (system_done == 0) {
                        _E("System session is not ready yet.");
                        return;

diff --git a/src/power/boot.h b/src/power/boot.h
index 8066011..efc43e6 100644 (file)
--- a/src/power/boot.h
+++ b/src/power/boot.h
@@ -19,7 +19,6 @@
 #ifndef __DEVICED_BOOT_H__
 #define __DEVICED_BOOT_H__
 
-int check_booting_finished(void);
 void add_booting_done_handler(void *data);
 void remove_booting_done_handler(void *data);
 

diff --git a/src/power/low-power.c b/src/power/low-power.c
index 27ba800..d9cdf0e 100644 (file)
--- a/src/power/low-power.c
+++ b/src/power/low-power.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <vconf.h>
 #include <glib.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/device-notifier.h"

diff --git a/src/power/power-handler.c b/src/power/power-handler.c
index e6a0552..4f9de31 100644 (file)
--- a/src/power/power-handler.c
+++ b/src/power/power-handler.c
@@ -36,8 +36,8 @@
 #include <bundle.h>
 #include <eventsystem.h>
 #include <stdbool.h>
-#include <libgdbus/dbus-system.h>
-#include <libgdbus/dbus-systemd.h>
+#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/dbus-systemd.h>
 
 #include "dd-deviced.h"
 #include "core/log.h"

diff --git a/src/proc/cpu-info.c b/src/proc/cpu-info.c
index 041c966..79f437f 100644 (file)
--- a/src/proc/cpu-info.c
+++ b/src/proc/cpu-info.c
@@ -18,7 +18,7 @@
 
 
 #include <fcntl.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/shared/deviced-systemd.c b/src/shared/deviced-systemd.c
index cc475be..fe65226 100644 (file)
--- a/src/shared/deviced-systemd.c
+++ b/src/shared/deviced-systemd.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <gio/gio.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "common.h"
 #include "deviced-systemd.h"

diff --git a/src/thermal/thermal.c b/src/thermal/thermal.c
index 6b8b50c..3de70b9 100644 (file)
--- a/src/thermal/thermal.c
+++ b/src/thermal/thermal.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 
 #include <hw/thermal.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "apps/apps.h"
 #include "core/devices.h"

diff --git a/src/time/time-handler.c b/src/time/time-handler.c
index bca84bc..fe7c7bf 100644 (file)
--- a/src/time/time-handler.c
+++ b/src/time/time-handler.c
@@ -30,7 +30,7 @@
 #include <linux/rtc.h>
 #include <fcntl.h>
 #include <sys/timerfd.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/touchscreen/sensitivity.c b/src/touchscreen/sensitivity.c
index fd96660..689b1ea 100644 (file)
--- a/src/touchscreen/sensitivity.c
+++ b/src/touchscreen/sensitivity.c
@@ -20,7 +20,7 @@
 #include <device-node.h>
 #include <vconf.h>
 #include <hw/touchsensitivity.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/devices.h"
 #include "core/common.h"

diff --git a/src/tzip/tzip.c b/src/tzip/tzip.c
index 929c021..f66aa76 100644 (file)
--- a/src/tzip/tzip.c
+++ b/src/tzip/tzip.c
@@ -34,7 +34,7 @@
 #include <attr/xattr.h>
 #include <linux/limits.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"

diff --git a/src/usb-host-test/usb-host-test.c b/src/usb-host-test/usb-host-test.c
index bfb9354..7e7e283 100644 (file)
--- a/src/usb-host-test/usb-host-test.c
+++ b/src/usb-host-test/usb-host-test.c
@@ -22,8 +22,8 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <unistd.h>
-#include <libgdbus/dbus-system.h>
-#include <libgdbus/dbus-systemd.h>
+#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/dbus-systemd.h>
 
 #include "core/log.h"
 #include "core/config-parser.h"

diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c
index db6e0dd..122ce09 100644 (file)
--- a/src/usb/usb-dbus.c
+++ b/src/usb/usb-dbus.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <device-node.h>
 #include <vconf.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/common.h"

diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c
index 3d4451b..85dd475 100644 (file)
--- a/src/usbhost/usb-host.c
+++ b/src/usbhost/usb-host.c
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <tzplatform_config.h>
-#include <libgdbus/dbus-system.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "core/log.h"
 #include "core/devices.h"