Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
* we don't want ecore_file in edje
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_edit.patch 24 Feb 2008 03:52:58 -0000 1.15
+++ edje_edit.patch 24 Feb 2008 04:22:12 -0000 1.16
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 24 Feb 2008 03:41:56 -0000
++++ Doxyfile 24 Feb 2008 04:19:47 -0000
@@ -1,7 +1,7 @@
PROJECT_NAME = Edje
PROJECT_NUMBER =
@@ -23,28 +23,13 @@
INHERIT_DOCS = YES
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
-Index: configure.in
-===================================================================
-RCS file: /cvs/e/e17/libs/edje/configure.in,v
-retrieving revision 1.93
-diff -u -r1.93 configure.in
---- configure.in 25 Jan 2008 03:35:46 -0000 1.93
-+++ configure.in 24 Feb 2008 03:41:56 -0000
-@@ -66,6 +66,7 @@
- evas >= 0.9.9
- ecore-evas >= 0.9.9
- ecore-job >= 0.9.9
-+ ecore-file >= 0.9.9
- eet >= 0.9.10
- embryo >= 0.9.1
- ])
Index: gendoc
===================================================================
RCS file: /cvs/e/e17/libs/edje/gendoc,v
retrieving revision 1.6
diff -u -r1.6 gendoc
--- gendoc 6 Dec 2007 23:42:38 -0000 1.6
-+++ gendoc 24 Feb 2008 03:41:56 -0000
++++ gendoc 24 Feb 2008 04:19:47 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
cp ./edje.c.in ./edje.c
@@ -68,7 +53,7 @@
RCS file: src/lib/Edje_Edit.h
diff -N src/lib/Edje_Edit.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/Edje_Edit.h 24 Feb 2008 03:41:57 -0000
++++ src/lib/Edje_Edit.h 24 Feb 2008 04:19:47 -0000
@@ -0,0 +1,1361 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
@@ -1437,7 +1422,7 @@
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- src/lib/Makefile.am 18 Jan 2008 06:38:46 -0000 1.39
-+++ src/lib/Makefile.am 24 Feb 2008 03:41:57 -0000
++++ src/lib/Makefile.am 24 Feb 2008 04:19:47 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1463,8 +1448,8 @@
RCS file: src/lib/edje_edit.c
diff -N src/lib/edje_edit.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/lib/edje_edit.c 24 Feb 2008 03:41:57 -0000
-@@ -0,0 +1,3264 @@
++++ src/lib/edje_edit.c 24 Feb 2008 04:19:47 -0000
+@@ -0,0 +1,3272 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
@@ -1480,7 +1465,6 @@
+#include <locale.h>
+#include <errno.h>
+#include <Ecore_Evas.h>
-+#include <Ecore_File.h>
+#include "Edje.h"
+#include "edje_private.h"
+#include "../bin/edje_cc.h"
@@ -3601,10 +3585,12 @@
+ Font *fn;
+ Edje_Font_Directory_Entry *fnt;
+ Eet_File *eetf;
++ struct stat st;
++ char *name;
+
+ GET_ED_OR_RETURN(0)
+ if (!path) return 0;
-+ if (!ecore_file_can_read(path)) return 0;
++ if (stat(path, &st) || !S_ISREG(st.st_mode)) return 0;
+ if (!ed->file) return 0;
+ if (!ed->path) return 0;
+
@@ -3616,8 +3602,13 @@
+ /* Create Font */
+ fn = mem_alloc(sizeof(Font));
+ if (!fn) return 0;
-+ fn->file = (char *)ecore_file_file_get(path);
-+ fn->name = (char *)ecore_file_file_get(path);
++
++ if ((name = strrchr(path, '/'))) name ++;
++ else name = (char *)path;
++
++ fn->file = mem_strdup(name);
++ fn->name = mem_strdup(name);
++
+ /*{
+ Evas_List *l;
+
@@ -3783,10 +3774,10 @@
+ Evas_List *l;
+ Edje_Image_Directory_Entry *de;
+ int free_id;
++ char *name;
+
-+
-+
+ GET_ED_OR_RETURN(0)
++
+ if (!path) return 0;
+ if (!ed->file) return 0;
+ if (!ed->path) return 0;
@@ -3815,7 +3806,9 @@
+
+ /* Create Image Entry */
+ de = mem_alloc(sizeof(Edje_Image_Directory_Entry));
-+ de->entry = mem_strdup(ecore_file_file_get(path)); //TODO need strdup??
++ if (name = strrchr(path, '/')) name++;
++ else name = (char *)path;
++ de->entry = mem_strdup(name);
+ de->id = free_id;
+ de->source_type = 1;
+ de->source_param = 1;
@@ -4735,7 +4728,7 @@
retrieving revision 1.58
diff -u -r1.58 edje_embryo.c
--- src/lib/edje_embryo.c 25 Jan 2008 03:35:46 -0000 1.58
-+++ src/lib/edje_embryo.c 24 Feb 2008 03:41:57 -0000
++++ src/lib/edje_embryo.c 24 Feb 2008 04:19:47 -0000
@@ -847,7 +847,7 @@
Edje *ed;
int part_id = 0;
@@ -4751,7 +4744,7 @@
retrieving revision 1.113
diff -u -r1.113 edje_load.c
--- src/lib/edje_load.c 22 Feb 2008 10:42:50 -0000 1.113
-+++ src/lib/edje_load.c 24 Feb 2008 03:41:58 -0000
++++ src/lib/edje_load.c 24 Feb 2008 04:19:47 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
@@ -4776,7 +4769,7 @@
retrieving revision 1.138
diff -u -r1.138 edje_private.h
--- src/lib/edje_private.h 21 Feb 2008 18:48:36 -0000 1.138
-+++ src/lib/edje_private.h 24 Feb 2008 03:41:58 -0000
++++ src/lib/edje_private.h 24 Feb 2008 04:19:48 -0000
@@ -329,31 +329,31 @@
struct _Edje_Program /* a conditional program to be run */
-------------------------------------------------------------------------
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
