summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/edje/ChangeLog5
-rw-r--r--legacy/edje/NEWS1
-rw-r--r--legacy/edje/src/lib/edje_util.c5
3 files changed, 7 insertions, 4 deletions
diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index b2cfb0101f..69335b07c0 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -667,4 +667,7 @@
6672012-10-31 Carsten Haitzler (The Rasterman) 6672012-10-31 Carsten Haitzler (The Rasterman)
668 668
669 * Fix edje_cc to use max compression, not default compression. 669 * Fix edje_cc to use max compression, not default compression.
670 670
6712012-10-31 ChunEon Park (Hermet)
672
673 * Fix to update the text classes when text classes are changed.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 04d9c2b864..e81db82a8a 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -26,6 +26,7 @@ Fixes:
26 * fix scale_set with edje containing boxes and/or tables 26 * fix scale_set with edje containing boxes and/or tables
27 * fix scale_set with edje containing groups 27 * fix scale_set with edje containing groups
28 * fix edje_cc to use max, not default compression 28 * fix edje_cc to use max, not default compression
29 * fix edje_text_class_set to update the text classes correctly.
29 30
30 31
31Edje 1.7.0 32Edje 1.7.0
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index d314e5eb98..a17381754c 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -964,9 +964,8 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
964 else 964 else
965 { 965 {
966 /* Match and the same, return */ 966 /* Match and the same, return */
967 if ((tc->size == size) || 967 if (((tc->font && font) && !strcmp(tc->font, font)) &&
968 (tc->font == font) || 968 (tc->size == size))
969 (tc->font && font && !strcmp(tc->font, font)))
970 return EINA_TRUE; 969 return EINA_TRUE;
971 970
972 /* Update the class found */ 971 /* Update the class found */