From e259a3b6453eceb3a1b86183f4b40a8a792a978e Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Thu, 7 Feb 2013 05:55:49 +0000 Subject: [PATCH] elementary/elm_entry : elm_entry_single_line_set should not change cnp_mode when PLAINTEXT mode. SVN revision: 83702 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/src/lib/elm_entry.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 99abdab0db..e6aeb0a9a0 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -976,3 +976,7 @@ 2013-02-05 ChunEon Park (Hermet) * Index supports "language,changed" smart callback. + +2013-02-07 WooHyun Jung + + * elm_entry_single_line_set should not change cnp_mode when PLAINTEXT mode. diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 977a60f4cf..2d59a8872b 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -3136,7 +3136,8 @@ _single_line_set(Eo *obj, void *_pd, va_list *list) sd->single_line = single_line; sd->line_wrap = ELM_WRAP_NONE; - elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE); + if (elm_entry_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP) + elm_entry_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE); eo_do(obj, elm_wdg_theme(NULL)); if (sd->scroll)