From 8f57043b2565b3c0ed4fbd1fca07316c3b340083 Mon Sep 17 00:00:00 2001
From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Wed, 27 Feb 2013 21:03:13 +0900
Subject: [PATCH] [access][popup] fix elm_object_style_set(); issue: it removes
 previous part object

---
 legacy/elementary/src/lib/elc_popup.c | 91 ++++++++++++++-------------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c
index 413629b1d2..6c6e49cb51 100644
--- a/legacy/elementary/src/lib/elc_popup.c
+++ b/legacy/elementary/src/lib/elc_popup.c
@@ -225,6 +225,52 @@ _mirrored_set(Evas_Object *obj,
        edje_object_mirrored_set(VIEW(item), rtl);
 }
 
+static void
+_access_obj_process(Eo *obj, Eina_Bool is_access)
+{
+   Evas_Object *ao;
+
+   ELM_POPUP_DATA_GET(obj, sd);
+   Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
+
+   if (is_access)
+     {
+        if (sd->title_text)
+          {
+             ao = _elm_access_edje_object_part_object_register
+                    (obj, wd->resize_obj, ACCESS_TITLE_PART);
+             _elm_access_text_set(_elm_access_object_get(ao),
+                                  ELM_ACCESS_TYPE, E_("Popup Title"));
+             _elm_access_text_set(_elm_access_object_get(ao),
+                                  ELM_ACCESS_INFO, sd->title_text);
+          }
+
+        if (sd->text_content_obj)
+          {
+             ao = _elm_access_edje_object_part_object_register
+                    (obj, wd->resize_obj, ACCESS_BODY_PART);
+             _elm_access_text_set(_elm_access_object_get(ao),
+                                  ELM_ACCESS_TYPE, E_("Popup Body Text"));
+             _elm_access_text_set(_elm_access_object_get(ao),
+               ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj));
+          }
+     }
+   else
+     {
+        if (sd->title_text)
+          {
+             _elm_access_edje_object_part_object_unregister
+                    (obj, wd->resize_obj, ACCESS_TITLE_PART);
+          }
+
+        if (sd->text_content_obj)
+          {
+             _elm_access_edje_object_part_object_unregister
+                    (obj, wd->resize_obj, ACCESS_BODY_PART);
+          }
+     }
+}
+
 static void
 _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
 {
@@ -301,6 +347,9 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
    edje_object_message_signal_process(wd->resize_obj);
    elm_layout_sizing_eval(obj);
 
+   /* access */
+   if (_elm_config->access_mode) _access_obj_process(obj, EINA_TRUE);
+
    if (ret) *ret = EINA_TRUE;
 }
 
@@ -783,48 +832,6 @@ _item_new(Elm_Popup_Item *item)
    evas_object_show(VIEW(item));
 }
 
-static void
-_access_obj_process(Eo *obj, Eina_Bool is_access)
-{
-   Evas_Object *ao;
-
-   ELM_POPUP_DATA_GET(obj, sd);
-   Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS);
-
-   if (is_access)
-     {
-        if (sd->title_text)
-          {
-             ao = _elm_access_edje_object_part_object_register
-                    (obj, wd->resize_obj, ACCESS_TITLE_PART);
-             _elm_access_text_set(_elm_access_object_get(ao),
-                                  ELM_ACCESS_TYPE, E_("Popup Title"));
-          }
-
-        if (sd->text_content_obj)
-          {
-             ao = _elm_access_edje_object_part_object_register
-                    (obj, wd->resize_obj, ACCESS_BODY_PART);
-             _elm_access_text_set(_elm_access_object_get(ao),
-                                  ELM_ACCESS_TYPE, E_("Popup Body Text"));
-          }
-     }
-   else
-     {
-        if (sd->title_text)
-          {
-             _elm_access_edje_object_part_object_unregister
-                    (obj, wd->resize_obj, ACCESS_TITLE_PART);
-          }
-
-        if (sd->text_content_obj)
-          {
-             _elm_access_edje_object_part_object_unregister
-                    (obj, wd->resize_obj, ACCESS_BODY_PART);
-          }
-     }
-}
-
 static Eina_Bool
 _title_text_set(Evas_Object *obj,
                 const char *text)