[EGIT] [core/efl] master 01/02: edje: Edje_Edit - fix edje_edit_part_source_set

[Andrii Kroitor]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=aec9cf0a3e222b9f6c023a71519f63c61afa65e3

commit aec9cf0a3e222b9f6c023a71519f63c61afa65e3
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Wed Jun 4 19:15:19 2014 +0200

    edje: Edje_Edit - fix edje_edit_part_source_set
    
    Summary:
    Fixed edje_edit_part_source_set so that it does not destroy TEXTBLOCK.
    Changed type check to switch-case to stress allowed types.
    
    @fix
    
    Reviewers: cedric, raster, seoz, Hermet
    
    Reviewed By: cedric
    
    CC: reutskiy.v.v, cedric
    
    Differential Revision: https://phab.enlightenment.org/D931
    
    Signed-off-by: Cedric BAIL <c.b...@partner.samsung.com>
---
 src/lib/edje/edje_edit.c | 49 +++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 4782667..1d6cc3f 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2858,27 +2858,38 @@ edje_edit_part_source_set(Evas_Object *obj, const char 
*part, const char *source
    Evas_Object *child_obj;
    //printf("Set source for part: %s [source: %s]\n", part, source);
 
-   if (rp->part->type == EDJE_PART_TYPE_EXTERNAL)
-     return EINA_FALSE;
-
-   _edje_if_string_free(ed, rp->part->source);
-
-   if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object))
-     {
-       _edje_real_part_swallow_clear(ed, rp);
-       evas_object_del(rp->typedata.swallow->swallowed_object);
-       rp->typedata.swallow->swallowed_object = NULL;
-     }
-   if (source)
+   switch(rp->part->type)
      {
-       rp->part->source = eina_stringshare_add(source);
-       child_obj = edje_object_add(ed->base->evas);
-       edje_object_file_set(child_obj, ed->file->path, source);
-       _edje_real_part_swallow(ed, rp, child_obj, EINA_TRUE);
+      case EDJE_PART_TYPE_GROUP:
+         {
+            if ((rp->typedata.swallow) && 
(rp->typedata.swallow->swallowed_object))
+              {
+                 _edje_real_part_swallow_clear(ed, rp);
+                 evas_object_del(rp->typedata.swallow->swallowed_object);
+                 rp->typedata.swallow->swallowed_object = NULL;
+              }
+            if (source)
+              {
+                 child_obj = edje_object_add(ed->base->evas);
+                 edje_object_file_set(child_obj, ed->file->path, source);
+                 _edje_real_part_swallow(ed, rp, child_obj, EINA_TRUE);
+              }
+         }
+      case EDJE_PART_TYPE_TEXTBLOCK:
+         {
+            _edje_if_string_free(ed, rp->part->source);
+            if (source)
+               rp->part->source = eina_stringshare_add(source);
+            else
+               rp->part->source = NULL;
+            return EINA_TRUE;
+         }
+      case EDJE_PART_TYPE_EXTERNAL: //EXTERNAL part has source property but it 
cannot be changed
+      default:
+         {
+            return EINA_FALSE;
+         }
      }
-   else
-     rp->part->source = NULL;
-   return EINA_TRUE;
 }
 
 EAPI int

--