summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2016-07-05 08:05:19 +0200
committerLukasz Stanislawski <l.stanislaws@samsung.com>2016-07-05 08:25:09 +0200
commit84035f293090acc8b4b289a2e7bac869b33a7337 (patch)
treec55080eeac9193f408609f94c16a0cc87f1f5f9a
parente97753377939c5c8e9e6c56809a26715bca1e4cb (diff)
downloadshare-panel-84035f293090acc8b4b289a2e7bac869b33a7337.tar.gz
share-panel-84035f293090acc8b4b289a2e7bac869b33a7337.tar.bz2
share-panel-84035f293090acc8b4b289a2e7bac869b33a7337.zip
close share-panel after forward app.submit/tizen/20160705.071628
Patch fixes behavioral change intruduced in 3d5b45c60e66e44f9aee2701e64ec84bc723ad0b. When share-panel use aul_forward_app it should exit instead of waiting for paused state. Patch fixes display bug (share-panel blink after app was selected). Additionally remove all clean-up functions from terminate_cb since the seems useless. Change-Id: I030cacb67e671842f777547ed8e4c6f02a5ba706
-rw-r--r--src/grid.c9
-rw-r--r--src/share_panel.c13
2 files changed, 2 insertions, 20 deletions
diff --git a/src/grid.c b/src/grid.c
index 21749f5..5d10ffd 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -127,13 +127,6 @@ static void __del(void *data, Evas_Object *obj)
evas_object_data_del(obj, PRIVATE_DATA_KEY_ITEM_INFO);
}
-void _app_reply_cb (app_control_h request, app_control_h reply,
- app_control_result_e result, void *user_data)
-{
- if (result == APP_CONTROL_RESULT_APP_STARTED || result == APP_CONTROL_RESULT_SUCCEEDED)
- ui_app_exit();
-}
-
int _app_control_launch(item_s *item)
{
retv_if(!item->caller_control, APP_CONTROL_ERROR_INVALID_PARAMETER);
@@ -174,6 +167,8 @@ static void __item_selected(void *data, Evas_Object *obj, void *event_info)
if (ret < 0)
_E("Fail to launch app(%d)", ret);
+ else
+ ui_app_exit();
item_info->share_panel->after_launch = 1;
diff --git a/src/share_panel.c b/src/share_panel.c
index 6630174..91b51ca 100644
--- a/src/share_panel.c
+++ b/src/share_panel.c
@@ -237,18 +237,6 @@ static bool _create_cb(void *data)
return true;
}
-
-static void _terminate_cb(void *data)
-{
- share_panel_h *share_panel = data;
-
- ret_if(!share_panel);
-
- share_panel_hide(*share_panel);
- share_panel_destroy(*share_panel);
-}
-
-
static void _app_control(app_control_h control, void *data)
{
share_panel_h *share_panel = data;
@@ -304,7 +292,6 @@ EAPI int main(int argc, char **argv)
share_panel_h share_panel = NULL;
lifecycle_callback.create = _create_cb;
- lifecycle_callback.terminate = _terminate_cb;
lifecycle_callback.pause = _pause_cb;
lifecycle_callback.resume = NULL;
lifecycle_callback.app_control = _app_control;