From: woohyun <woohyun@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Sat, 19 Nov 2011 03:50:58 +0000 (+0000)
Subject: elementary/elm_widget : sd2->parent should be set as NULL after all
X-Git-Tag: REL_F_I9500_20120323_1~17^2~1318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d34ee5f51922d9708d7931250e3b10cfedb81eb;p=framework%2Fuifw%2Felementary.git

elementary/elm_widget : sd2->parent should be set as NULL after all
focus control is finished.


git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@65400 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 532c69b..ad37dfc 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -983,17 +983,6 @@ elm_widget_sub_object_del(Evas_Object *obj,
      }
    if (_elm_widget_is(sobj))
      {
-        Smart_Data *sd2 = evas_object_smart_data_get(sobj);
-        if (sd2)
-          {
-             sd2->parent_obj = NULL;
-             if (sd2->resize_obj == sobj)
-               sd2->resize_obj = NULL;
-             else
-               sd->subobjs = eina_list_remove(sd->subobjs, sobj);
-          }
-        else
-          sd->subobjs = eina_list_remove(sd->subobjs, sobj);
         if (elm_widget_focus_get(sobj))
           {
              elm_widget_tree_unfocusable_set(sobj, EINA_TRUE);
@@ -1013,6 +1002,17 @@ elm_widget_sub_object_del(Evas_Object *obj,
                     }
                }
           }
+        Smart_Data *sd2 = evas_object_smart_data_get(sobj);
+        if (sd2)
+          {
+             sd2->parent_obj = NULL;
+             if (sd2->resize_obj == sobj)
+               sd2->resize_obj = NULL;
+             else
+               sd->subobjs = eina_list_remove(sd->subobjs, sobj);
+          }
+        else
+          sd->subobjs = eina_list_remove(sd->subobjs, sobj);
      }
    else
      sd->subobjs = eina_list_remove(sd->subobjs, sobj);