edje - backport 78741

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/edje-1.7@78743 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index d7db092..0d1a39a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -594,3 +594,6 @@
 
         * Fix edje_cc to use max compression, not default compression.
 
+2012-10-31  ChunEon Park (Hermet)
+
+        * Fix to update the text classes when text classes are changed.

diff --git a/NEWS b/NEWS
index bf59982..a5e29a6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Changes since Edje 1.7.1:
 Fixes:
     * fix scale_set with edje containing boxes and/or tables
     * fix edje_cc to use max, not default compression
+    * fix edje_text_class_set to update the text classes correctly.
     
 Edje 1.7.1
 

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index d18f386..b6d2b3f 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -824,10 +824,9 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
    else
      {
         /* Match and the same, return */
-        if ((tc->size == size) ||
-            (tc->font == font) ||
-            (tc->font && font && !strcmp(tc->font, font)))
-           return EINA_TRUE;
+        if (((tc->font && font) && !strcmp(tc->font, font)) &&
+            (tc->size == size))
+          return EINA_TRUE;
 
         /* Update the class found */
         eina_stringshare_replace(&tc->font, font);