Fix edje edje_color_class_list() and edje_text_class_list() to look at the

correct hashes when returning.

diff --git a/ChangeLog b/ChangeLog
index fc5f3a6..13c8e91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-18  Carsten Haitzler (The Rasterman)
+
+        * Fix edje edje_color_class_list() and edje_text_class_list() to
+        look at the correct hashes when returning.
+
 2013-02-17  Mike Blumenkrantz
 
         * fix anchor clicked mouse signals for selection-enabled entries

diff --git a/NEWS b/NEWS
index f7ce5b4..13bdeed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -172,3 +172,4 @@ Fixes:
     * Fix bug candidate word couldn't be selected with up/down key in the preedit status
     * Edje textblock: Improved textblock fit.
     * fix anchor clicked mouse signals for selection-enabled entries
+    * 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 d8fa16e..a1e9508 100644 (file)
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -701,10 +701,9 @@ edje_color_class_list(void)
 {
    Edje_List_Foreach_Data fdata;
 
-   if (!_edje_color_class_member_hash) return NULL;
-
+   if (!_edje_color_class_hash) return NULL;
    memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
-   eina_hash_foreach(_edje_color_class_member_hash,
+   eina_hash_foreach(_edje_color_class_hash,
                      _edje_color_class_list_foreach, &fdata);
 
    return fdata.list;
@@ -1029,8 +1028,9 @@ edje_text_class_list(void)
 {
    Edje_List_Foreach_Data fdata;
 
+   if (!_edje_text_class_hash) return NULL;
    memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
-   eina_hash_foreach(_edje_text_class_member_hash,
+   eina_hash_foreach(_edje_text_class_hash,
                      _edje_text_class_list_foreach, &fdata);
    return fdata.list;
 }