summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunjin Lee <yunjin-.lee@samsung.com>2018-06-25 17:10:51 +0900
committerYunjin Lee <yunjin-.lee@samsung.com>2018-06-25 18:23:15 +0900
commit63474388075f7fca63b0e2ed25b2d5fba980fba1 (patch)
tree2007e329817f4341b555b30467a1524a06acfa1f
parent10d1f284b8d304a9d0c0ff0f32ede88bbf0a071a (diff)
downloadprivacy-setting-63474388075f7fca63b0e2ed25b2d5fba980fba1.tar.gz
privacy-setting-63474388075f7fca63b0e2ed25b2d5fba980fba1.tar.bz2
privacy-setting-63474388075f7fca63b0e2ed25b2d5fba980fba1.zip
Close popup when language changed
Change-Id: Iadccf917da4d182fa4d761b4e263127a844c08c2 Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>
-rw-r--r--ui-popup/src/popup.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/ui-popup/src/popup.c b/ui-popup/src/popup.c
index 649d0f4..eb0c9a2 100644
--- a/ui-popup/src/popup.c
+++ b/ui-popup/src/popup.c
@@ -100,16 +100,19 @@ static void __check_response_cb(void *data, Evas_Object *obj, void *event_info)
{
papp_data_s *ad = (papp_data_s*)data;
__send_launch_request(PRIVACY_SETTING, ad->caller_pkgid);
- if (__reply_requested(ad->caller))
+ if (!ad->user_responsed && __reply_requested(ad->caller)) {
+ ad->user_responsed = true;
__send_reply(ad->caller, "yes");
- ad->user_responsed = true;
+ }
}
static void __close_response_cb(void *data, Evas_Object *obj, void *event_info)
{
papp_data_s *ad = (papp_data_s*)data;
- if (__reply_requested(ad->caller))
+ if (!ad->user_responsed && __reply_requested(ad->caller)) {
+ ad->user_responsed = true;
__send_reply(ad->caller, "no");
+ }
ui_app_exit();
}
@@ -182,15 +185,6 @@ static char* __get_message(const char* padding, papp_data_s *ad)
}
}
-static void __label_lang_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
- papp_data_s *ad = (papp_data_s*)data;
- Evas_Object *label = (Evas_Object*)obj;
-
- elm_object_text_set(label, __get_message(LABEL_PADDING, ad));
- elm_atspi_accessible_name_set(label, __get_message(AO_LABEL_PADDING, ad));
-}
-
/*Privacy List*/
void create_view(papp_data_s *ad)
{
@@ -238,7 +232,7 @@ void create_view(papp_data_s *ad)
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(layout, "elm.swallow.content", label);
- evas_object_smart_callback_add(label, "language,changed", __label_lang_changed_cb, ad);
+ evas_object_smart_callback_add(label, "language,changed", __close_response_cb, ad);
eext_rotary_object_event_activated_set(eext_scroller, EINA_TRUE);