Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Makefile.am edje_embryo.c edje_load.c edje_private.h
edje_textblock_styles.c
Log Message:
add cedrics dict check patch
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- Makefile.am 18 Jan 2008 06:38:46 -0000 1.39
+++ Makefile.am 6 Mar 2008 17:52:58 -0000 1.40
@@ -14,7 +14,8 @@
libedje.la
include_HEADERS = \
-Edje.h
+Edje.h \
+Edje_Edit.h
libedje_la_SOURCES = \
edje_calc.c \
@@ -35,7 +36,8 @@
edje_private.h \
edje_cache.c \
edje_match.c \
-edje_textblock_styles.c
+edje_textblock_styles.c \
+edje_edit.c
libedje_la_LIBADD = -lm @EDJE_LIBS@
libedje_la_DEPENDENCIES = $(top_builddir)/config.h
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- edje_embryo.c 25 Jan 2008 03:35:46 -0000 1.58
+++ edje_embryo.c 6 Mar 2008 17:52:58 -0000 1.59
@@ -847,7 +847,7 @@
Edje *ed;
int part_id = 0;
Edje_Real_Part *rp;
- char *s;
+ const char *s;
CHKPARAM(4);
ed = embryo_program_data_get(ep);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- edje_load.c 2 Mar 2008 02:47:36 -0000 1.119
+++ edje_load.c 6 Mar 2008 17:52:58 -0000 1.120
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
-static void _edje_collection_free_part_description_free(Edje_Part_Description
*desc, unsigned int free_strings);
+void _edje_collection_free_part_description_free(Edje_Part_Description *desc,
unsigned int free_strings);
static Evas_Bool _edje_file_collection_hash_foreach(const Evas_Hash *hash,
const char *key, void *data, void *fdata);
#ifdef EDJE_PROGRAM_CACHE
static int _edje_collection_free_prog_cache_matches_free_cb(Evas_Hash *hash,
const char *key, void *data, void *fdata);
@@ -948,7 +948,7 @@
free(ec);
}
-static void
+void
_edje_collection_free_part_description_free(Edje_Part_Description *desc,
unsigned int free_strings)
{
while (desc->image.tween_list)
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- edje_private.h 1 Mar 2008 06:38:09 -0000 1.143
+++ edje_private.h 6 Mar 2008 17:52:59 -0000 1.144
@@ -380,31 +380,31 @@
struct _Edje_Program /* a conditional program to be run */
{
- int id; /* id of program */
- char *name; /* name of the action */
+ int id; /* id of program */
+ const char *name; /* name of the action */
- char *signal; /* if signal emission name matches the glob here... */
- char *source; /* if part that emitted this (name) matches this glob */
+ const char *signal; /* if signal emission name matches the glob here... */
+ const char *source; /* if part that emitted this (name) matches this glob */
struct {
- double from;
- double range;
+ double from;
+ double range;
} in;
- int action; /* type - set state, stop action, set drag pos etc. */
- char *state; /* what state of alternates to apply, NULL = default */
- char *state2; /* what other state to use - for signal emit action */
- double value; /* value of state to apply (if multiple names match) */
- double value2; /* other value for drag actions */
+ int action; /* type - set state, stop action, set drag pos etc. */
+ const char *state; /* what state of alternates to apply, NULL = default */
+ const char *state2; /* what other state to use - for signal emit action */
+ double value; /* value of state to apply (if multiple names match) */
+ double value2; /* other value for drag actions */
struct {
- int mode; /* how to tween - linear, sinusoidal etc. */
- double time; /* time to graduate between current and new state */
+ int mode; /* how to tween - linear, sinusoidal etc. */
+ double time; /* time to graduate between current and new state */
} tween;
- Evas_List *targets; /* list of target parts to apply the state to */
+ Evas_List *targets; /* list of target parts to apply the state to */
- Evas_List *after; /* list of actions to run at the end of this, for looping
*/
+ Evas_List *after; /* list of actions to run at the end of this, for
looping */
};
struct _Edje_Program_Target /* the target of an action */
@@ -461,7 +461,7 @@
struct _Edje_Part
{
- char *name; /* the name if any of the part */
+ const char *name; /* the name if any of the part */
Edje_Part_Description *default_desc; /* the part descriptor for default */
Evas_List *other_desc; /* other possible descriptors */
char *source;
@@ -500,7 +500,7 @@
{
struct {
double value; /* the value of the state (for ranges) */
- char *name; /* the named state if any */
+ const char *name; /* the named state if any */
} state;
Edje_Alignment align; /* 0 <-> 1.0 alignment within allocated space */
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_textblock_styles.c 3 Mar 2008 16:10:22 -0000 1.17
+++ edje_textblock_styles.c 6 Mar 2008 17:52:59 -0000 1.18
@@ -426,8 +426,8 @@
/* Add and Handle tag parsed data */
if (ts)
{
- /* FIXME: How to know if the previous value was a
stringshare */
-/* evas_stringshare_del(tag->value); */
+ if (eet_dictionary_string_check(eet_dictionary_get(edf->ef),
tag->value) == 0)
+ evas_stringshare_del(tag->value);
tag->value = evas_stringshare_add(ts);
buf = _edje_strbuf_append(buf, tag->value, &buflen,
&bufalloc);
free(ts);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
