From: lokilee73 <changjoo.lee@samsung.com>
Date: Mon, 25 Jun 2018 11:58:17 +0000 (+0900)
Subject: Remove launch_powerkey_popup() and add signature for powerkey popup
X-Git-Tag: submit/tizen/20180626.073513^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=044148ce81cf40bc874554d4ca789cf8efed69cf;p=platform%2Fcore%2Fsystem%2Fsystem-popup.git

Remove launch_powerkey_popup() and add signature for powerkey popup

There is no signature for powerkey popup, But actually, an array is made for dbus-send.

array [
   dict entry(
      string "_SYSPOPUP_CONTENT_"
      string "powerkey"
   )

The array is necessary in load_popup_by_type() for popup activation.
So, add signature a{ss} and use launch_popup() instead of launch_powerkey_popup()
for efficiency.

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

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index 4f4f1cd..bb3d91f 100755
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -81,7 +81,7 @@ dbus_system_methods[] = {
 static DBusMessage *powerkey_popup(E_DBus_Object *obj, DBusMessage *msg)
 {
 	set_timer_to_terminate();
-	return launch_powerkey_popup(obj, msg, POWERKEY_SYSPOPUP);
+	return launch_popup(obj, msg, POWERKEY_SYSPOPUP);
 }
 
 /* Overheat popup */
@@ -228,7 +228,7 @@ static DBusMessage *media_device_noti_on(E_DBus_Object *obj, DBusMessage *msg)
 
 static const struct edbus_method
 dbus_powerkey_methods[] = {
-	{ "PopupLaunch", NULL, "i", powerkey_popup },
+	{ "PopupLaunch", "a{ss}", "i", powerkey_popup },
 	/* Add methods here */
 };
 
diff --git a/src/launcher/popup.c b/src/launcher/popup.c
index e396fc1..6bd7227 100755
--- a/src/launcher/popup.c
+++ b/src/launcher/popup.c
@@ -79,44 +79,3 @@ out:
 
 	return reply;
 }
-
-DBusMessage *launch_powerkey_popup(E_DBus_Object *obj,
-				DBusMessage *msg, char *name)
-{
-	DBusMessage *reply;
-	DBusMessageIter iter;
-	int ret;
-	bundle *b = NULL;
-
-	if (!name) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	_I("launch popup (%s)", name);
-
-	b = bundle_create();
-	if (!b) {
-		ret = -ENOMEM;
-		goto out;
-	}
-
-	ret = bundle_add(b, POPUP_CONTENT, POPUP_NAME_POWERKEY);
-	if (ret < 0) {
-		_E("Failed to add bundle (%s,%s) (ret:%d)", POPUP_CONTENT, POPUP_NAME_POWERKEY, ret);
-		goto out;
-	}
-
-	ret = syspopup_launch(name, b);
-	if (ret < 0)
-		_E("Failed to launch popup(%d)", ret);
-
-out:
-	if (b)
-		bundle_free(b);
-
-	reply = dbus_message_new_method_return(msg);
-	dbus_message_iter_init_append(reply, &iter);
-	dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &ret);
-	return reply;
-}