diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/edje/src/lib/edje_load.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/edje/src/lib/edje_load.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/libraries/edje/src/lib/edje_load.c b/libraries/edje/src/lib/edje_load.c index 8fe5842..b63cd88 100644 --- a/libraries/edje/src/lib/edje_load.c +++ b/libraries/edje/src/lib/edje_load.c | |||
@@ -132,7 +132,7 @@ edje_file_group_exists(const char *file, const char *glob) | |||
132 | edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL); | 132 | edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL); |
133 | if (!edf) | 133 | if (!edf) |
134 | return EINA_FALSE; | 134 | return EINA_FALSE; |
135 | 135 | ||
136 | for (p = glob; *p; p++) | 136 | for (p = glob; *p; p++) |
137 | { | 137 | { |
138 | if ((*p == '*') || (*p == '?') || (*p == '[')) | 138 | if ((*p == '*') || (*p == '?') || (*p == '[')) |
@@ -141,7 +141,7 @@ edje_file_group_exists(const char *file, const char *glob) | |||
141 | break; | 141 | break; |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | if (is_glob) | 145 | if (is_glob) |
146 | { | 146 | { |
147 | if (!edf->collection_patterns) | 147 | if (!edf->collection_patterns) |
@@ -149,18 +149,18 @@ edje_file_group_exists(const char *file, const char *glob) | |||
149 | Edje_Part_Collection_Directory_Entry *ce; | 149 | Edje_Part_Collection_Directory_Entry *ce; |
150 | Eina_Iterator *i; | 150 | Eina_Iterator *i; |
151 | Eina_List *l = NULL; | 151 | Eina_List *l = NULL; |
152 | 152 | ||
153 | i = eina_hash_iterator_data_new(edf->collection); | 153 | i = eina_hash_iterator_data_new(edf->collection); |
154 | 154 | ||
155 | EINA_ITERATOR_FOREACH(i, ce) | 155 | EINA_ITERATOR_FOREACH(i, ce) |
156 | l = eina_list_append(l, ce); | 156 | l = eina_list_append(l, ce); |
157 | 157 | ||
158 | eina_iterator_free(i); | 158 | eina_iterator_free(i); |
159 | 159 | ||
160 | edf->collection_patterns = edje_match_collection_dir_init(l); | 160 | edf->collection_patterns = edje_match_collection_dir_init(l); |
161 | eina_list_free(l); | 161 | eina_list_free(l); |
162 | } | 162 | } |
163 | 163 | ||
164 | succeed = edje_match_collection_dir_exec(edf->collection_patterns, glob); | 164 | succeed = edje_match_collection_dir_exec(edf->collection_patterns, glob); |
165 | if (edf->collection_patterns) | 165 | if (edf->collection_patterns) |
166 | { | 166 | { |
@@ -226,6 +226,20 @@ _edje_programs_patterns_init(Edje *ed) | |||
226 | if (ssp->signals_patterns) | 226 | if (ssp->signals_patterns) |
227 | return; | 227 | return; |
228 | 228 | ||
229 | if (getenv("EDJE_DUMP_PROGRAMS")) | ||
230 | { | ||
231 | INF("Group '%s' programs:", ed->group); | ||
232 | #define EDJE_DUMP_PROGRAM(Section) \ | ||
233 | for (i = 0; i < ed->collection->programs.Section##_count; i++) \ | ||
234 | INF(#Section" for ('%s', '%s')", ed->collection->programs.Section[i]->signal, ed->collection->programs.Section[i]->source); | ||
235 | |||
236 | EDJE_DUMP_PROGRAM(strcmp); | ||
237 | EDJE_DUMP_PROGRAM(strncmp); | ||
238 | EDJE_DUMP_PROGRAM(strrncmp); | ||
239 | EDJE_DUMP_PROGRAM(fnmatch); | ||
240 | EDJE_DUMP_PROGRAM(nocmp); | ||
241 | } | ||
242 | |||
229 | edje_match_program_hash_build(ed->collection->programs.strcmp, | 243 | edje_match_program_hash_build(ed->collection->programs.strcmp, |
230 | ed->collection->programs.strcmp_count, | 244 | ed->collection->programs.strcmp_count, |
231 | &ssp->exact_match); | 245 | &ssp->exact_match); |
@@ -294,6 +308,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g | |||
294 | 308 | ||
295 | ed->load_error = EDJE_LOAD_ERROR_NONE; | 309 | ed->load_error = EDJE_LOAD_ERROR_NONE; |
296 | _edje_file_add(ed); | 310 | _edje_file_add(ed); |
311 | ed->block_break = 0; | ||
297 | 312 | ||
298 | if (ed->file && ed->file->external_dir) | 313 | if (ed->file && ed->file->external_dir) |
299 | { | 314 | { |