Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/entice

Dir     : e17/apps/entice/src/bin


Modified Files:
        entice.c 


Log Message:
fixup for themes w/o entice.thumb group, thanks tokyo
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- entice.c    5 Jun 2004 15:58:33 -0000       1.56
+++ entice.c    29 Jun 2004 00:06:33 -0000      1.57
@@ -444,6 +444,10 @@
          {
             evas_object_layer_set(o,
                                   evas_object_layer_get(entice->container));
+            entice->thumb.list = evas_list_append(entice->thumb.list, o);
+            esmart_container_element_append(entice->container, edje);
+
+
             edje = edje_object_add(ecore_evas_get(entice->ee));
             if (edje_object_file_set
                 (edje, entice_config_theme_get(), "entice.thumb"))
@@ -453,8 +457,6 @@
                                                            container));
                if (edje_object_part_exists(edje, "entice.thumb"))
                {
-                  entice->thumb.list =
-                     evas_list_append(entice->thumb.list, o);
                   evas_object_resize(o, (Evas_Coord) 48, (Evas_Coord) 48);
                   hookup_entice_thumb_signals(edje, o);
                   evas_object_layer_set(o,
@@ -467,9 +469,6 @@
                   entice->thumb.hash =
                      evas_hash_add(entice->thumb.hash, buf, edje);
 
-                  esmart_container_element_append(entice->container, edje);
-                  if (evas_list_count(entice->thumb.list) == 1)
-                     _entice_thumb_load(o, NULL, NULL, NULL);
                }
                else
                {
@@ -484,8 +483,6 @@
                fprintf(stderr,
                        "Broken Theme!!! You didn't define an "
                        "entice.thumb group\n");
-               evas_object_del(edje);
-               evas_object_del(o);
                result = 1;
             }
          }
@@ -493,12 +490,17 @@
          {
             result = 1;
          }
+         if (result)
+            evas_object_del(edje);
       }
       else
          result = 2;
    }
    else
       result = 3;
+
+   if (evas_list_count(entice->thumb.list) == 1)
+      _entice_thumb_load(o, NULL, NULL, NULL);
    return (result);
 }
 




-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to