jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=6b21eeab0fab8154d9183487892a48b87feb8908

commit 6b21eeab0fab8154d9183487892a48b87feb8908
Author: Jaehyun Cho <[email protected]>
Date:   Thu Mar 26 22:52:55 2015 +0900

    Set default font if font name is given with NULL.
---
 src/bin/text_setting.c | 4 +++-
 src/lib/edc_editor.c   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index a5434ca..09913d1 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -1010,7 +1010,9 @@ text_setting_font_apply(const char *font_name, const char 
*font_style)
    snprintf(text_class_name, sizeof(text_class_name), "%s_setting_entry",
             elm_app_name_get());
 
-   char *font = elm_font_fontconfig_name_get(font_name, font_style);
+   char *font = NULL;
+   if (font_name)
+     font = elm_font_fontconfig_name_get(font_name, font_style);
    edje_text_class_set(text_class_name, font, -100);
    elm_font_fontconfig_name_free(font);
 
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 9fe9fdc..5969d28 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -125,9 +125,9 @@ entry_recover(edit_data *ed, int cursor_pos)
 static void
 edit_font_apply(edit_data *ed, const char *font_name, const char *font_style)
 {
-   if (!font_name) return;
-
-   char *font = elm_font_fontconfig_name_get(font_name, font_style);
+   char *font = NULL;
+   if (font_name)
+     font = elm_font_fontconfig_name_get(font_name, font_style);
    edje_text_class_set("enventor_entry", font, -100);
    elm_font_fontconfig_name_free(font);
 

-- 


Reply via email to