From d135e0c9ea98c56d2fb3f652c427db26436efce7 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Fri, 31 Oct 2014 20:48:39 +0900 Subject: [PATCH] enventor: Fix T1756 (wrong group name is displayed in status bar) Summary: Fix to not display wrong group name in status bar with empty template. Reviewers: Hermet Differential Revision: https://phab.enlightenment.org/D1628 --- src/bin/main.c | 1 - src/lib/edc_editor.c | 4 ++-- src/lib/enventor_smart.c | 11 ++++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 29bd801..6ac3999 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -361,7 +361,6 @@ enventor_cursor_group_changed_cb(void *data EINA_UNUSED, void *event_info) { const char *group_name = event_info; - if (!group_name) return; stats_edc_group_update(group_name); } diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 918a9e4..72817e0 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -722,6 +722,7 @@ edit_edc_load(edit_data *ed, const char *file_path) Eina_File *file = NULL; Eina_Strbuf *strbuf_line = NULL; + Eina_Stringshare *group_name = NULL; char *utf8_edit = NULL; char *markup_edit = NULL; char *markup_line = NULL; @@ -763,8 +764,7 @@ edit_edc_load(edit_data *ed, const char *file_path) ed->line_max = line_num; - Eina_Stringshare *group_name = - parser_first_group_name_get(ed->pd, ed->en_edit); + group_name = parser_first_group_name_get(ed->pd, ed->en_edit); ecore_animator_add(syntax_color_timer_cb, ed); diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index a22f893..445cfe6 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -89,13 +89,10 @@ edit_view_sync_cb(void *data, Eina_Stringshare *part_name, vd = edj_mgr_view_new(group_name); if (!vd) return; } - if (group_name) - { - eina_stringshare_del(pd->group_name); - pd->group_name = eina_stringshare_add(group_name); - evas_object_smart_callback_call(pd->obj, SIG_CURSOR_GROUP_CHANGED, - (void *) group_name); - } + eina_stringshare_del(pd->group_name); + pd->group_name = eina_stringshare_add(group_name); + evas_object_smart_callback_call(pd->obj, SIG_CURSOR_GROUP_CHANGED, + (void *) group_name); } view_part_highlight_set(VIEW_DATA, part_name); }