Add SYSTEM_SERVICE build feature for switching system dbus and session dbus

Change-Id: I73eae5d22d5043ddae6c3e0ce71523388bb10ac0
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef82e59..29f614c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,10 @@ IF(${LEGACY_SECURITY})
        ADD_DEFINITIONS(-DLEGACY_SECURITY)
 ENDIF(${LEGACY_SECURITY})
 
+IF(${SYSTEM_SERVICE})
+       ADD_DEFINITIONS(-DSYSTEM_SERVICE)
+ENDIF(${SYSTEM_SERVICE})
+
 # Common Options
 INCLUDE(FindPkgConfig)
 INCLUDE_DIRECTORIES(

diff --git a/packaging/context.spec b/packaging/context.spec
index dddc1bc..d2e1a19 100644 (file)
--- a/packaging/context.spec
+++ b/packaging/context.spec
@@ -8,6 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 
 %define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}}
 
+%define SYSTEM_SERVICE 0
 %define LEGACY_SECURITY        0
 %define LEGACY_APPFW   0
 
@@ -63,6 +64,7 @@ export CXXFLAGS+=" -D_ALLOW_SERVICE_APP_TRIGGER_"
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \
                                                           -DPROFILE=%{?BUILD_PROFILE} \
+                                                          -DSYSTEM_SERVICE=%{SYSTEM_SERVICE} \
                                                           -DLEGACY_SECURITY=%{LEGACY_SECURITY} \
                                                           -DLEGACY_APPFW=%{LEGACY_APPFW}
 make %{?jobs:-j%jobs}

diff --git a/src/DBusClient.cpp b/src/DBusClient.cpp
index d8a6d24..6509950 100644 (file)
--- a/src/DBusClient.cpp
+++ b/src/DBusClient.cpp
@@ -112,7 +112,11 @@ bool DBusClient::__init()
        __nodeInfo = g_dbus_node_info_new_for_xml(__introspection, NULL);
        IF_FAIL_RETURN_TAG(__nodeInfo != NULL, false, _E, "Initialization failed");
 
+#ifdef SYSTEM_SERVICE
+       addr = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SYSTEM, NULL, &gerr);
+#else
        addr = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SESSION, NULL, &gerr);
+#endif
        HANDLE_GERROR(gerr);
        IF_FAIL_CATCH_TAG(addr != NULL, _E, "Getting address failed");
        _SD("Address: %s", addr);