summaryrefslogtreecommitdiff
path: root/legacy/edje
diff options
context:
space:
mode:
authorTiago Rezende Campos Falcao <developer@tiagofalcao.com>2010-08-10 14:25:10 +0000
committerTiago Rezende Campos Falcao <developer@tiagofalcao.com>2010-08-10 14:25:10 +0000
commit51d0738c9717cc1b3b145ae9c3a34a6f3b3db248 (patch)
tree82944da0e4ba18fc903351def0cc343fdabdf436 /legacy/edje
parent7833796e00c1c99d7e1556cffab823a3bb2fd0aa (diff)
Adding checkers to data and font lists get
SVN revision: 50964
Diffstat (limited to 'legacy/edje')
-rw-r--r--legacy/edje/src/lib/edje_edit.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 3a51678d63..156323b3d0 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -1102,16 +1102,16 @@ EAPI Eina_List *
1102edje_edit_group_data_list_get(Evas_Object * obj) 1102edje_edit_group_data_list_get(Evas_Object * obj)
1103{ 1103{
1104 Eina_Iterator *it; 1104 Eina_Iterator *it;
1105 Eina_List *datas; 1105 Eina_List *datas = NULL;
1106 const char *key; 1106 const char *key;
1107 1107
1108 GET_ED_OR_RETURN(NULL); 1108 GET_ED_OR_RETURN(NULL);
1109 1109
1110 if (!ed->file || !ed->collection) 1110 if (!ed->file || !ed->collection || !ed->collection->data)
1111 return NULL; 1111 return NULL;
1112 1112
1113 datas = NULL;
1114 it = eina_hash_iterator_key_new(ed->collection->data); 1113 it = eina_hash_iterator_key_new(ed->collection->data);
1114 if (!it) return NULL;
1115 1115
1116 EINA_ITERATOR_FOREACH(it, key) 1116 EINA_ITERATOR_FOREACH(it, key)
1117 datas = eina_list_append(datas, eina_stringshare_add(key)); 1117 datas = eina_list_append(datas, eina_stringshare_add(key));
@@ -3875,20 +3875,22 @@ FUNC_TEXT_BOOL_FIT(y);
3875EAPI Eina_List * 3875EAPI Eina_List *
3876edje_edit_fonts_list_get(Evas_Object *obj) 3876edje_edit_fonts_list_get(Evas_Object *obj)
3877{ 3877{
3878 Edje_Font_Directory_Entry *f; 3878 Eina_Iterator *it;
3879 Eina_Iterator *i;
3880 Eina_List *fonts = NULL; 3879 Eina_List *fonts = NULL;
3880 Edje_Font_Directory_Entry *f;
3881 3881
3882 GET_ED_OR_RETURN(NULL); 3882 GET_ED_OR_RETURN(NULL);
3883 3883
3884 if (!ed->file) return NULL; 3884 if (!ed->file || !ed->file->fonts) return NULL;
3885 3885
3886 //printf("GET FONT LIST for %s\n", ed->file->path); 3886 it = eina_hash_iterator_data_new(ed->file->fonts);
3887 i = eina_hash_iterator_data_new(ed->file->fonts); 3887 if (!it) return NULL;
3888 3888
3889 EINA_ITERATOR_FOREACH(i, f) 3889 EINA_ITERATOR_FOREACH(it, f)
3890 fonts = eina_list_append(fonts, f); 3890 fonts = eina_list_append(fonts, f);
3891 3891
3892 eina_iterator_free(it);
3893
3892 return fonts; 3894 return fonts;
3893} 3895}
3894 3896