Fix the bug which the callbacks of the sub-object are added even if the sub-object...

SVN revision: 82382

diff --git a/ChangeLog b/ChangeLog
index 736de31afd40cbef8b03f8a1f371c3afcb76c227..e75e2c771410484be55e7c47f9a1b59df642cdf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -694,3 +694,7 @@
 2013-01-06  Jaehyun Cho (jae_hyun_cho@naver.com)
 
         * Fix omitting signal emission when customized text parts change the text.
+
+2013-01-08  Jaehwan Kim
+
+        * Fix the bug which the callbacks of the sub-object are added even if the sub-object is added the parent object.

diff --git a/NEWS b/NEWS
index f847a3ad128b429adb3e9549f563b6e833acf0c3..25468558acc4e8bc399e3e9b35136d13f3ff5f42 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Changes since Elementary 1.7.5:
 Fixes:
 
    * Fix omitting signal emission when customized text parts change the text.
+   * Fix the bug which the callbacks of the sub-object are added even if the sub-object is added the parent object.
 
 Changes since Elementary 1.7.4:
 -------------------------

diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index fe0632b2f01b071026e4d1dff06a8482469ff1b8..633659fd9b34ffad161ab3d153254277beddd840 100644 (file)
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -124,6 +124,9 @@ static Eina_Bool
 _elm_flip_smart_sub_object_add(Evas_Object *obj,
                                Evas_Object *sobj)
 {
+   if (evas_object_data_get(sboj, "elm-parent") == obj)
+     return EINA_TRUE;
+
    if (!ELM_WIDGET_CLASS(_elm_flip_parent_sc)->sub_object_add(obj, sobj))
      return EINA_FALSE;
 

diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 281d71cd8bafe1eb2da2e27a40d9befae488ce47..7db1616c0496e4d4792f5982e6280ac4347dc1d6 100644 (file)
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -323,6 +323,9 @@ _elm_hover_smart_sub_object_add(Evas_Object *obj,
 {
    ELM_HOVER_DATA_GET(obj, sd);
 
+   if (evas_object_data_get(sboj, "elm-parent") == obj)
+     return EINA_TRUE;
+
    if (!ELM_WIDGET_CLASS(_elm_hover_parent_sc)->sub_object_add(obj, sobj))
      return EINA_FALSE;
 

diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index f69f6705e336fcf3b329c9cfcbfe9a999cb004ef..b0eb94307650da50951ca6da9916602f9b52f873 100644 (file)
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -402,6 +402,9 @@ static Eina_Bool
 _elm_layout_smart_sub_object_add(Evas_Object *obj,
                                  Evas_Object *sobj)
 {
+   if (evas_object_data_get(sboj, "elm-parent") == obj)
+     return EINA_TRUE;
+
    if (!ELM_WIDGET_CLASS(_elm_layout_parent_sc)->sub_object_add(obj, sobj))
      return EINA_FALSE;