[usb-moded] Communicate with the Lipstick device lock implementation

sailfishos · Aug 16, 2013 · 68a8336 · 68a8336
1 parent 92c2b2e
commit 68a8336
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/usb_moded-devicelock.c b/src/usb_moded-devicelock.c
@@ -110,7 +110,7 @@ static DBusHandlerResult devicelock_unlocked_cb(DBusConnection *conn, DBusMessag
   const char         *member    = dbus_message_get_member(msg);
   const char         *object    = dbus_message_get_path(msg);
   int                 type      = dbus_message_get_type(msg);
-  int ret=0, ret1 = 0;
+  int ret=0;
 
   (void) user_data;
 
@@ -123,7 +123,7 @@ static DBusHandlerResult devicelock_unlocked_cb(DBusConnection *conn, DBusMessag
   // handle known signals
   else if( !strcmp(member, "stateChanged") )
   {
-        dbus_message_get_args(msg, NULL, DBUS_TYPE_INT32, &ret1, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
+        dbus_message_get_args(msg, NULL, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
   	log_debug("Devicelock state changed. New state = %d\n", ret);
   	if(ret == 0 && get_usb_connection_state() == 1 )
   	{	

diff --git a/src/usb_moded-devicelock.h b/src/usb_moded-devicelock.h
@@ -23,10 +23,10 @@
 
 /*============================================================================= */
 
-#define DEVICELOCK_SERVICE		"com.nokia.devicelock"
-#define DEVICELOCK_REQUEST_PATH		"/request"
-#define DEVICELOCK_REQUEST_IF		"com.nokia.devicelock"
-#define DEVICELOCK_STATE_REQ		"getState"
+#define DEVICELOCK_SERVICE		"org.nemomobile.lipstick"
+#define DEVICELOCK_REQUEST_PATH		"/devicelock"
+#define DEVICELOCK_REQUEST_IF		"org.nemomobile.lipstick.devicelock"
+#define DEVICELOCK_STATE_REQ		"state"
 
 #define DEVICELOCK_LOCKED		"Locked"