Apply dbus activation

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

diff --git a/packaging/org.tizen.peripheral_io.service b/packaging/org.tizen.peripheral_io.service
new file mode 100644 (file)
index 0000000..fa08737
--- /dev/null
+++ b/packaging/org.tizen.peripheral_io.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.peripheral_io
+Exec=/bin/false
+SystemdService=peripheral-bus.service

diff --git a/packaging/peripheral-bus.spec b/packaging/peripheral-bus.spec
index f2afc26cb2fda92854c7a491b5863876151881cf..37dfc3077acef2b8ff70292b2bf4a2ca6638e273 100644 (file)
--- a/packaging/peripheral-bus.spec
+++ b/packaging/peripheral-bus.spec
@@ -10,6 +10,7 @@ Source2:    %{name}.service
 Source3:    %{name}.tmpfiles.conf
 Source4:    90-peripheral-io.rules
 Source5:    org.tizen.peripheral_io.conf
+Source6:    org.tizen.peripheral_io.service
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -50,6 +51,8 @@ install -m 0644 %SOURCE4 %{buildroot}%{_udevrulesdir}
 %install_service multi-user.target.wants peripheral-bus.service
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/dbus-1/system.d/
+mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
+install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/dbus-1/system-services/
 
 mkdir -p %{buildroot}/etc/peripheral-bus
 cp %{_builddir}/%{name}-%{version}/data/*.ini %{buildroot}/etc/%{name}
@@ -57,6 +60,7 @@ cp %{_builddir}/%{name}-%{version}/data/*.ini %{buildroot}/etc/%{name}
 %files
 %manifest %{name}.manifest
 %config %{_sysconfdir}/dbus-1/system.d/*
+%config %{_datadir}/dbus-1/system-services/*
 %defattr(-,root,root,-)
 %license LICENSE.APLv2
 %{_bindir}/%{name}

diff --git a/src/peripheral_bus.c b/src/peripheral_bus.c
index 00995278848924fca5c7323c867b065344941467..53a637932b5390aca847620c25310500d7f30629 100644 (file)
--- a/src/peripheral_bus.c
+++ b/src/peripheral_bus.c
@@ -282,6 +282,8 @@ static void on_bus_acquired(GDBusConnection *connection,
 static void on_name_acquired(GDBusConnection *conn,
                                const gchar *name, gpointer user_data)
 {
+       _D("sd_notify(READY=1)");
+       sd_notify(0, "READY=1");
 }
 
 static void on_name_lost(GDBusConnection *conn,
@@ -290,14 +292,6 @@ static void on_name_lost(GDBusConnection *conn,
        _E("Dbus name is lost!");
 }
 
-static gboolean peripheral_bus_notify(gpointer data)
-{
-       _D("sd_notify(READY=1)");
-       sd_notify(0, "READY=1");
-
-       return G_SOURCE_REMOVE;
-}
-
 int main(int argc, char *argv[])
 {
        GMainLoop *loop;
@@ -333,8 +327,6 @@ int main(int argc, char *argv[])
 
        loop = g_main_loop_new(NULL, FALSE);
 
-       g_idle_add(peripheral_bus_notify, NULL);
-
        peripheral_privilege_init();
 
        _D("Enter main loop!");