Use the org.nemobmobile.devicelock service for devicelock.

sailfishos · Oct 7, 2016 · 47aa1fc · 47aa1fc
1 parent 5e7c854
commit 47aa1fc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/powerkey.c b/powerkey.c
@@ -855,9 +855,9 @@ pwrkey_action_unblank(void)
 static void
 pwrkey_action_devlock(void)
 {
-    static const char service[]   = "org.nemomobile.lipstick";
-    static const char object[]    = "/devicelock";
-    static const char interface[] = "org.nemomobile.lipstick.devicelock";
+    static const char service[]   = DEVICELOCK_SERVICE;
+    static const char object[]    = DEVICELOCK_REQUEST_PATH;
+    static const char interface[] = DEVICELOCK_REQUEST_IF;
     static const char method[]    = "setState";
     dbus_int32_t      request     = DEVICE_LOCK_LOCKED;
 

diff --git a/systemui/dbus-names.h b/systemui/dbus-names.h
@@ -28,4 +28,13 @@
 /** The System UI request path. */
 #define SYSTEMUI_REQUEST_PATH  "/screenlock"
 
+/** The device lock service */
+#define DEVICELOCK_SERVICE       "org.nemomobile.devicelock"
+
+/** The device lock request interface. */
+#define DEVICELOCK_REQUEST_IF    "org.nemomobile.lipstick.devicelock"
+
+/** The device lock request path. */
+#define DEVICELOCK_REQUEST_PATH  "/devicelock"
+
 #endif /* _SYSTEMUI_DBUS_NAMES_H */
diff --git a/tklock.c b/tklock.c
@@ -5449,9 +5449,9 @@ static void tklock_ui_get_device_lock_cb(DBusPendingCall *pc, void *aptr)
 static void tklock_ui_get_device_lock(void)
 {
     mce_log(LL_DEBUG, "query device lock status");
-    dbus_send(SYSTEMUI_SERVICE,
-              "/devicelock",
-              "org.nemomobile.lipstick.devicelock",
+    dbus_send(DEVICELOCK_SERVICE,
+              DEVICELOCK_REQUEST_PATH,
+              DEVICELOCK_REQUEST_IF,
               "state",
               tklock_ui_get_device_lock_cb,
               DBUS_TYPE_INVALID);