Fix dbus returned error by unmatched signature between storaged and system-popup

Change-Id: Iecf6cd5c6f57484b813bd9983bf9a5af0975714c
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

diff --git a/src/shared/apps.c b/src/shared/apps.c
old mode 100644 (file)
new mode 100755 (executable)
index 4d7b13b..b0154e4
--- a/src/shared/apps.c
+++ b/src/shared/apps.c
@@ -1,5 +1,5 @@
 /*
- * deviced
+ * storaged
  *
  * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd.
  *
@@ -34,6 +34,26 @@ static const struct app_dbus_match {
        { POPUP_DEFAULT, POPUP_BUS_NAME, POPUP_PATH_SYSTEM, POPUP_INTERFACE_SYSTEM, POPUP_METHOD_LAUNCH },
 };
 
+static void __cb(GVariant *var, void *user_data, GError *err)
+{
+        int ret;
+
+       if (!var) {
+               _E("no message [%s]", err->message);
+               return;
+       }
+
+       if (!dh_get_param_from_var(var, "(i)", &ret)) {
+               _E("no message [%s]", g_variant_get_type_string(var));
+               goto out;
+       }
+
+       _D("reply value : %d", ret);
+
+out:
+       g_variant_unref(var);
+}
+
 int launch_system_app(char *type, int num, ...)
 {
        char *app_type;
@@ -59,11 +79,15 @@ int launch_system_app(char *type, int num, ...)
 
        va_start(args, num);
 
-       ret = dbus_handle_method_async_pairs(app_match[match].bus,
-                       app_match[match].path,
-                       app_match[match].iface,
-                       app_match[match].method,
-                       num, args);
+       ret = dbus_handle_method_async_pairs_with_reply(app_match[match].bus,
+               app_match[match].path,
+               app_match[match].iface,
+               app_match[match].method,
+               num,
+               args,
+               __cb,
+               -1,
+               NULL);
 
        va_end(args);
 

diff --git a/src/shared/apps.h b/src/shared/apps.h
old mode 100644 (file)
new mode 100755 (executable)
index cbd51ab..5dcaba7
--- a/src/shared/apps.h
+++ b/src/shared/apps.h
@@ -1,5 +1,5 @@
 /*
- * deviced
+ * storaged
  *
  * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd.
  *

diff --git a/src/storage/storage.c b/src/storage/storage.c
old mode 100644 (file)
new mode 100755 (executable)
index c6965e9..26aa270
--- a/src/storage/storage.c
+++ b/src/storage/storage.c
@@ -181,6 +181,26 @@ static void memcleanup_send_broadcast(struct storage_config_info *info, enum mem
 
 }
 
+static void __cb(GVariant *var, void *user_data, GError *err)
+{
+        int ret;
+
+       if (!var) {
+               _E("no message [%s]", err->message);
+               return;
+       }
+
+       if (!dh_get_param_from_var(var, "(i)", &ret)) {
+               _E("no message [%s]", g_variant_get_type_string(var));
+               goto out;
+       }
+
+       _D("reply value : %d", ret);
+
+out:
+       g_variant_unref(var);
+}
+
 static int launch_memory_popup(int num, ...)
 {
        int ret;
@@ -188,11 +208,15 @@ static int launch_memory_popup(int num, ...)
 
        va_start(args, num);
 
-       ret = dbus_handle_method_async_pairs(POPUP_BUS_NAME,
+       ret = dbus_handle_method_async_pairs_with_reply(POPUP_BUS_NAME,
                        POPUP_PATH_SYSTEM,
                        POPUP_INTERFACE_SYSTEM,
                        "PopupLaunch",
-                       num, args);
+                       num,
+                       args,
+                       __cb,
+                       -1,
+                       NULL);
 
        va_end(args);