summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-02-18 15:41:43 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-02-18 15:42:28 +0900
commit28218fe8561dd5e1708e6b61eef55f234354822f (patch)
tree234ccca7ac86d9577cde4b65e39b3b46d93a7216
parent15e85877aff402bfc7a95a4f34fb88435d1b82eb (diff)
Fix edje edje_color_class_list() and edje_text_class_list() to look at the
correct hashes when returning.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--src/lib/edje/edje_util.c8
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fc5f3a6469..13c8e918b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-02-18 Carsten Haitzler (The Rasterman)
2
3 * Fix edje edje_color_class_list() and edje_text_class_list() to
4 look at the correct hashes when returning.
5
12013-02-17 Mike Blumenkrantz 62013-02-17 Mike Blumenkrantz
2 7
3 * fix anchor clicked mouse signals for selection-enabled entries 8 * fix anchor clicked mouse signals for selection-enabled entries
diff --git a/NEWS b/NEWS
index f7ce5b4d94..13bdeedcd6 100644
--- a/NEWS
+++ b/NEWS
@@ -172,3 +172,4 @@ Fixes:
172 * Fix bug candidate word couldn't be selected with up/down key in the preedit status 172 * Fix bug candidate word couldn't be selected with up/down key in the preedit status
173 * Edje textblock: Improved textblock fit. 173 * Edje textblock: Improved textblock fit.
174 * fix anchor clicked mouse signals for selection-enabled entries 174 * fix anchor clicked mouse signals for selection-enabled entries
175 * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes.
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index d8fa16ef55..a1e9508ff2 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -701,10 +701,9 @@ edje_color_class_list(void)
701{ 701{
702 Edje_List_Foreach_Data fdata; 702 Edje_List_Foreach_Data fdata;
703 703
704 if (!_edje_color_class_member_hash) return NULL; 704 if (!_edje_color_class_hash) return NULL;
705
706 memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); 705 memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
707 eina_hash_foreach(_edje_color_class_member_hash, 706 eina_hash_foreach(_edje_color_class_hash,
708 _edje_color_class_list_foreach, &fdata); 707 _edje_color_class_list_foreach, &fdata);
709 708
710 return fdata.list; 709 return fdata.list;
@@ -1029,8 +1028,9 @@ edje_text_class_list(void)
1029{ 1028{
1030 Edje_List_Foreach_Data fdata; 1029 Edje_List_Foreach_Data fdata;
1031 1030
1031 if (!_edje_text_class_hash) return NULL;
1032 memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); 1032 memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
1033 eina_hash_foreach(_edje_text_class_member_hash, 1033 eina_hash_foreach(_edje_text_class_hash,
1034 _edje_text_class_list_foreach, &fdata); 1034 _edje_text_class_list_foreach, &fdata);
1035 return fdata.list; 1035 return fdata.list;
1036} 1036}