Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_main.c edje_private.h edje_text.c
Log Message:
cleanies
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- Edje.h 12 Jan 2004 17:41:47 -0000 1.24
+++ Edje.h 20 Jan 2004 01:04:16 -0000 1.25
@@ -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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- edje_main.c 17 Jan 2004 16:00:56 -0000 1.29
+++ edje_main.c 20 Jan 2004 01:04:16 -0000 1.30
@@ -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 *
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- edje_private.h 19 Jan 2004 19:28:38 -0000 1.56
+++ edje_private.h 20 Jan 2004 01:04:16 -0000 1.57
@@ -426,8 +426,8 @@
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 @@
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 {
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;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_text.c 12 Jan 2004 02:13:11 -0000 1.11
+++ edje_text.c 20 Jan 2004 01:04:16 -0000 1.12
@@ -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 @@
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 @@
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 @@
void
_edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep)
{
- Evas_List *tmp;
-
while (ep->extra_objects)
{
Evas_Object *o;
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs