summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRadoslaw Czerski <r.czerski@samsung.com>2016-05-20 15:18:34 +0200
committerRadoslaw Czerski <r.czerski@samsung.com>2016-05-20 15:18:34 +0200
commit3d5b45c60e66e44f9aee2701e64ec84bc723ad0b (patch)
tree9aa2480828473fcd4b51eeff3a2898a00093bc40 /src
parentb3715e1fafac0bb23e8a7bd1ce4c69602ff2f714 (diff)
downloadshare-panel-3d5b45c60e66e44f9aee2701e64ec84bc723ad0b.tar.gz
share-panel-3d5b45c60e66e44f9aee2701e64ec84bc723ad0b.tar.bz2
share-panel-3d5b45c60e66e44f9aee2701e64ec84bc723ad0b.zip
Launch app request method Changed.
app_control_send_launch_request -> appaul_forward_app Change-Id: I3ab7fad92a62f1c8892ebacc8219000319689fd9 Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/grid.c18
-rw-r--r--src/ui_manager.c5
2 files changed, 15 insertions, 8 deletions
diff --git a/src/grid.c b/src/grid.c
index 37b8c72..30adaee 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -17,9 +17,12 @@
#include <Elementary.h>
#include <app.h>
#include <app_manager.h>
-#include <app_control.h>
+#include <app_control_internal.h>
+#include <bundle.h>
+#include <aul.h>
#include "share_panel_internal.h"
+
#include "conf.h"
#include "grid.h"
#include "log.h"
@@ -137,13 +140,14 @@ int _app_control_launch(item_s *item)
int ret = APP_CONTROL_ERROR_NONE;
- ret = app_control_set_app_id(item->caller_control, item->appid);
- retv_if(ret != APP_CONTROL_ERROR_NONE, ret);
+ bundle *control_bundle;
+
+ ret = app_control_export_as_bundle(item->caller_control, &control_bundle);
+ retv_if(ret != APP_CONTROL_ERROR_NONE, FAIL);
- ret = app_control_send_launch_request(item->caller_control, _app_reply_cb, NULL);
- retv_if(ret != APP_CONTROL_ERROR_NONE, ret);
+ ret = aul_forward_app(item->appid, control_bundle);
- _D("app launched");
+ bundle_free(control_bundle);
return ret;
}
@@ -170,8 +174,8 @@ static void __item_selected(void *data, Evas_Object *obj, void *event_info)
// ret_if(!selected_item);
// elm_gengrid_item_selected_set(selected_item, EINA_FALSE);
-
ret = _app_control_launch(item_info);
+
if (ret < 0)
_E("Fail to launch app(%d)", ret);
diff --git a/src/ui_manager.c b/src/ui_manager.c
index d5b16af..43a6c5a 100644
--- a/src/ui_manager.c
+++ b/src/ui_manager.c
@@ -20,6 +20,7 @@
#include "share_panel_internal.h"
#include "share_panel.h"
+
#include "log.h"
#include "grid.h"
#include "list.h"
@@ -219,10 +220,12 @@ Evas_Object *_ui_manager_create(share_panel_s *share_panel)
item_info = eina_list_nth(share_panel->list, 0);
goto_if(!item_info, ERROR);
- _app_control_launch(item_info);
+ ret = _app_control_launch(item_info);
+
if (ret < 0) {
_E("Fail to launch app(%d)", ret);
}
+
ui_app_exit();
}