From 943f1c3fc5b8d899e8bd00b8b2449c3fdd2d3970 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 3 May 2012 09:18:20 +0000 Subject: [PATCH] fix bug hermet added in font code! :) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@70692 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_font.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/lib/elm_font.c b/src/lib/elm_font.c index 481e8db..3b037a4 100644 --- a/src/lib/elm_font.c +++ b/src/lib/elm_font.c @@ -43,17 +43,18 @@ _elm_font_properties_get(Eina_Hash **font_hash, /* add a font name */ if (font_hash) + efp = eina_hash_find(*font_hash, name); + if (!efp) { - efp = eina_hash_find(*font_hash, name); - if (!efp) + efp = calloc(1, sizeof(Elm_Font_Properties)); + if (!efp) return NULL; + + efp->name = eina_stringshare_add(name); + if (font_hash) { - efp = calloc(1, sizeof(Elm_Font_Properties)); - if (!efp) return NULL; - - efp->name = eina_stringshare_add(name); if (!*font_hash) *font_hash = eina_hash_string_superfast_new(NULL); - eina_hash_add(*font_hash, name, efp); + eina_hash_add(*font_hash, name, efp); } } @@ -184,23 +185,15 @@ elm_font_available_hash_add(Eina_List *list) font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Regular"); font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Bold"); font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Sans:style=Bold Oblique"); - + font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Bold Oblique"); font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Regular"); font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Bold"); font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Serif:style=Bold Oblique"); - - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Regular"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Bold"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Bold Oblique"); + font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Bold Oblique"); + font_hash = _elm_font_available_hash_add(font_hash, "Monospace:style=Regular"); + font_hash = _elm_font_available_hash_add(font_hash, "Monospace:style=Bold"); + font_hash = _elm_font_available_hash_add(font_hash, "Monospace:style=Oblique"); + font_hash = _elm_font_available_hash_add(font_hash, "Monospace:style=Bold Oblique"); EINA_LIST_FOREACH(list, l, key) if (key) _elm_font_available_hash_add(font_hash, key); -- 2.7.4