From b2102064ed10512db28c3c0b828985057d891d8a Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 20 Jan 2004 01:04:16 +0000
Subject: [PATCH] cleanies

SVN revision: 8574
---
 legacy/edje/src/lib/Edje.h         |  4 ++--
 legacy/edje/src/lib/edje_main.c    | 25 ++++++++++++-------------
 legacy/edje/src/lib/edje_private.h | 12 ++++++------
 legacy/edje/src/lib/edje_text.c    | 19 +++++++++++++++----
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h
index 1781e6b5bc..47f64e468f 100644
--- a/legacy/edje/src/lib/Edje.h
+++ b/legacy/edje/src/lib/Edje.h
@@ -20,8 +20,8 @@
 extern "C" {
 #endif
    
-   void         edje_init                       (void);
-   void         edje_shutdown                   (void);
+   int          edje_init                       (void);
+   int          edje_shutdown                   (void);
    void         edje_frametime_set              (double t);
    double       edje_frametime_get              (void);
    void         edje_freeze                     (void);
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index adff2e8fb2..47fc58c4cf 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -3,30 +3,29 @@
 
 static int initted = 0;
 
-void
+int
 edje_init(void)
 {
-   if (initted) return;
-   initted = 1;
-
-   eet_init();
-
-   _edje_edd_setup();
-   _edje_text_init();
+   initted++;
+   if (initted == 1)
+     {
+	_edje_edd_setup();
+	_edje_text_init();
+     }
+   return initted;
 }
 
-void
+int
 edje_shutdown(void)
 {
-   if (!initted) return;
+   initted--;
+   if (initted > 0) return initted;
 
    _edje_edd_free();
    _edje_color_class_members_free();
    _edje_text_class_members_free();
 
-   eet_shutdown();
-
-   initted = 0;
+   return 0;
 }
 
 Edje *
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 06669db994..772daa1b0b 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -426,8 +426,8 @@ struct _Edje_Real_Part
       struct {
 	 int  x, y;
       } tmp;
-      double x, y;
-      char need_reset : 1;
+      double        x, y;
+      unsigned char need_reset : 1;
       struct {
 	 double x, y;
       } val, size, step, page;
@@ -474,8 +474,8 @@ struct _Edje_Signal_Callback
    char  *source;
    void (*func) (void *data, Evas_Object *o, const char *emission, const char *source);
    void  *data;
-   char   just_added : 1;
-   char   delete_me : 1;
+   unsigned char just_added : 1;
+   unsigned char delete_me : 1;
 };
 
 struct _Edje_Calc_Params
@@ -487,8 +487,8 @@ struct _Edje_Calc_Params
    struct {
       int           x, y, w, h;
    } req_drag;
-   char             visible : 1; 
-   char             smooth : 1;
+   unsigned char    visible : 1; 
+   unsigned char    smooth : 1;
    struct {
       int           x, y, w, h;
    } fill;
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index aca086a11c..25a7d9e927 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -1,8 +1,6 @@
 #include "Edje.h"
 #include "edje_private.h"
 
-static Evas_Hash   *_edje_text_class_hash = NULL;
-
 Edje_Text_Style _edje_text_styles[EDJE_TEXT_EFFECT_LAST];
 
 void
@@ -239,6 +237,14 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
 	free(pt->default_desc->text.text_class);
 	pt->default_desc->text.text_class = NULL;
      }
+
+   if (pt->default_desc && pt->default_desc->color_class)
+     {
+        _edje_color_class_member_del(ed, pt->default_desc->color_class);
+		free (pt->default_desc->color_class);
+		pt->default_desc->color_class = NULL;
+     }
+
    for (tmp = pt->other_desc; tmp; tmp = tmp->next)
      {
 	 Edje_Part_Description *desc;
@@ -250,6 +256,13 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
 	      free(desc->text.text_class);
 	      desc->text.text_class = NULL;
 	   }
+
+	 if (desc->color_class)
+	   {
+          _edje_color_class_member_del(ed, desc->color_class);
+		  free(desc->color_class);
+		  desc->color_class = NULL;
+	   }
      }
    return;
 }
@@ -257,8 +270,6 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
 void
 _edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep)
 {
-   Evas_List *tmp;
-
    while (ep->extra_objects)
      {
 	Evas_Object *o;