E CVS: libs/edje doursse

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/lib


Modified Files:
	Makefile.am edje_edit.c 


Log Message:
evilize edje. Link against ecore_file only when needed. PATH_MAX and not MAX_PATH. Minor other fixes.

===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- Makefile.am	31 May 2008 06:10:58 -0000	1.43
+++ Makefile.am	6 Jun 2008 18:31:48 -0000	1.44
@@ -9,7 +9,8 @@
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EDJE_CFLAGS@
+@EDJE_CFLAGS@ \
+@EVIL_CFLAGS@
 
 lib_LTLIBRARIES      = \
 libedje.la
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_edit.c	30 May 2008 08:00:25 -0000	1.14
+++ edje_edit.c	6 Jun 2008 18:31:49 -0000	1.15
@@ -15,13 +15,17 @@
 
 #include <locale.h>
 #include <errno.h>
+#include <limits.h>
+
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
 #include "Edje.h"
 #include "edje_private.h"
 #include "edje_cc.h"
 #include "Edje_Edit.h"
 
-#define MAX_PATH 4096
-
 /* Get ed(Edje*) from obj(Evas_Object*) */
 #define GET_ED_OR_RETURN(RET) \
    Edje *ed; \
@@ -1181,14 +1185,14 @@
 EAPI const char *
 edje_edit_part_selected_state_get(Evas_Object *obj, const char *part)
 {
-   char name[MAX_PATH];
+   char name[PATH_MAX];
 
    GET_RP_OR_RETURN(NULL);
 
    if (!rp->chosen_description)
      return "default 0.00";
 
-   snprintf(name, MAX_PATH, "%s %.2f",
+   snprintf(name, PATH_MAX, "%s %.2f",
             rp->chosen_description->state.name,
             rp->chosen_description->state.value);
 
@@ -1384,7 +1388,7 @@
 EAPI Evas_List *
 edje_edit_part_states_list_get(Evas_Object *obj, const char *part)
 {
-   char state_name[MAX_PATH];
+   char state_name[PATH_MAX];
    Evas_List *states;
    Evas_List *l;
    Edje_Part_Description *state;
@@ -1398,7 +1402,7 @@
 
    //append default state
    state = rp->part->default_desc;
-   snprintf(state_name, MAX_PATH,
+   snprintf(state_name, PATH_MAX,
             "%s %.2f", state->state.name, state->state.value);
    states = evas_list_append(states, evas_stringshare_add(state_name));
    //printf("NEW STATE def: %s\n", state->state.name);
@@ -2261,7 +2265,7 @@
 EAPI unsigned char
 edje_edit_font_add(Evas_Object *obj, const char* path)
 {
-   char buf[MAX_PATH];
+   char buf[PATH_MAX];
    Font *fn;
    Edje_Font_Directory_Entry *fnt;
    Eet_File *eetf;
@@ -3327,7 +3331,7 @@
 _edje_generate_source(Edje *ed)
 {
    printf("\n****** GENERATE SOURCE *********\n");
-   char tmpn[MAX_PATH];
+   char tmpn[PATH_MAX];
    int fd;
    FILE *f;
    long sz;