Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor
Modified Files:
edje_edit.patch
Log Message:
* Fix creation of program as of recent edje changes
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/edje_edit.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- edje_edit.patch 23 Feb 2008 04:23:26 -0000 1.13
+++ edje_edit.patch 23 Feb 2008 18:34:35 -0000 1.14
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -r1.4 Doxyfile
--- Doxyfile 6 Dec 2007 23:40:48 -0000 1.4
-+++ Doxyfile 23 Feb 2008 04:22:20 -0000
++++ Doxyfile 23 Feb 2008 18:30:58 -0000
@@ -1,7 +1,7 @@
PROJECT_NAME = Edje
PROJECT_NUMBER =
@@ -29,7 +29,7 @@
retrieving revision 1.93
diff -u -r1.93 configure.in
--- configure.in 25 Jan 2008 03:35:46 -0000 1.93
-+++ configure.in 23 Feb 2008 04:22:20 -0000
++++ configure.in 23 Feb 2008 18:30:58 -0000
@@ -66,6 +66,7 @@
evas >= 0.9.9
ecore-evas >= 0.9.9
@@ -44,7 +44,7 @@
retrieving revision 1.6
diff -u -r1.6 gendoc
--- gendoc 6 Dec 2007 23:42:38 -0000 1.6
-+++ gendoc 23 Feb 2008 04:22:20 -0000
++++ gendoc 23 Feb 2008 18:30:58 -0000
@@ -1,7 +1,7 @@
#!/bin/sh
cp ./edje.c.in ./edje.c
@@ -68,7 +68,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 23 Feb 2008 04:22:21 -0000
++++ src/lib/Edje_Edit.h 23 Feb 2008 18:30:59 -0000
@@ -0,0 +1,1342 @@
+#ifndef _EDJE_EDIT_H
+#define _EDJE_EDIT_H
@@ -1418,7 +1418,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 23 Feb 2008 04:22:21 -0000
++++ src/lib/Makefile.am 23 Feb 2008 18:30:59 -0000
@@ -14,7 +14,8 @@
libedje.la
@@ -1444,8 +1444,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 23 Feb 2008 04:22:21 -0000
-@@ -0,0 +1,3214 @@
++++ src/lib/edje_edit.c 23 Feb 2008 18:30:59 -0000
+@@ -0,0 +1,3234 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
@@ -3997,9 +3997,17 @@
+ ed->table_programs_size++;
+ ed->table_programs = realloc(ed->table_programs,
+ sizeof(Edje_Program *) *
ed->table_programs_size);
-+
+ ed->table_programs[epr->id % ed->table_programs_size] = epr;
+
++ //Update patterns
++ if (ed->patterns.programs.signals_patterns)
++ {
++ edje_match_patterns_free(ed->patterns.programs.signals_patterns);
++ edje_match_patterns_free(ed->patterns.programs.sources_patterns);
++ }
++ ed->patterns.programs.signals_patterns =
edje_match_programs_signal_init(ed->collection->programs);
++ ed->patterns.programs.sources_patterns =
edje_match_programs_source_init(ed->collection->programs);
++
+ return 1;
+}
+
@@ -4156,6 +4164,7 @@
+EAPI unsigned char
+edje_edit_program_source_set(Evas_Object *obj, const char *prog, const char
*source)
+{
++ GET_ED_OR_RETURN(0)
+ GET_EPR_OR_RETURN(0)
+ if (!source) return 0;
+
@@ -4164,6 +4173,11 @@
+ if (epr->source) evas_stringshare_del(epr->source);
+ epr->source = evas_stringshare_add(source);
+
++ //Update patterns
++ if (ed->patterns.programs.sources_patterns)
++ edje_match_patterns_free(ed->patterns.programs.sources_patterns);
++ ed->patterns.programs.sources_patterns =
edje_match_programs_source_init(ed->collection->programs);
++
+ return 1;
+}
+
@@ -4180,6 +4194,7 @@
+EAPI unsigned char
+edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char
*signal)
+{
++ GET_ED_OR_RETURN(0)
+ GET_EPR_OR_RETURN(0)
+ if (!signal) return 0;
+
@@ -4188,6 +4203,11 @@
+ if (epr->signal) evas_stringshare_del(epr->signal);
+ epr->signal = evas_stringshare_add(signal);
+
++ //Update patterns
++ if (ed->patterns.programs.signals_patterns)
++ edje_match_patterns_free(ed->patterns.programs.signals_patterns);
++ ed->patterns.programs.signals_patterns =
edje_match_programs_signal_init(ed->collection->programs);
++
+ return 1;
+}
+
@@ -4666,7 +4686,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 23 Feb 2008 04:22:21 -0000
++++ src/lib/edje_embryo.c 23 Feb 2008 18:30:59 -0000
@@ -847,7 +847,7 @@
Edje *ed;
int part_id = 0;
@@ -4682,7 +4702,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 23 Feb 2008 04:22:21 -0000
++++ src/lib/edje_load.c 23 Feb 2008 18:30:59 -0000
@@ -5,7 +5,7 @@
#include "Edje.h"
#include "edje_private.h"
@@ -4707,7 +4727,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 23 Feb 2008 04:22:21 -0000
++++ src/lib/edje_private.h 23 Feb 2008 18:30:59 -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
