Don't block for too long on device lock query, 1,5s should be ample t…

…ime. We don't want to block usb functionality for 20-30s Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
sailfishos · Oct 8, 2013 · 5c939ae · 5c939ae
1 parent f98550a
commit 5c939ae
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/usb_moded-devicelock.c b/src/usb_moded-devicelock.c
@@ -60,8 +60,9 @@ int usb_moded_get_export_permission(void)
 
   if ((msg = dbus_message_new_method_call(DEVICELOCK_SERVICE, DEVICELOCK_REQUEST_PATH, DEVICELOCK_REQUEST_IF, DEVICELOCK_STATE_REQ)) != NULL) 
   {
-    if ((reply = dbus_connection_send_with_reply_and_block(dbus_conn_devicelock, msg, -1, NULL)) != NULL)
-	{
+     /* default dbus timeout is too long, timeout after 1,5 seconds */
+     if ((reply = dbus_connection_send_with_reply_and_block(dbus_conn_devicelock, msg, 1500, NULL)) != NULL)
+     {
        dbus_message_get_args(reply, NULL, DBUS_TYPE_INT32, &ret, DBUS_TYPE_INVALID);
        dbus_message_unref(reply);
      }