From: Daniel Zaoui <daniel.zaoui@samsung.com>
Date: Tue, 5 Apr 2016 05:39:26 +0000 (+0300)
Subject: Popup: don't set wrap type if ELM_WRAP_NONE is given
X-Git-Tag: upstream/1.20.0~6955
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7400abbf688b62ec82356e870d122a09545849e;p=platform%2Fupstream%2Fefl.git

Popup: don't set wrap type if ELM_WRAP_NONE is given

If ELM_WRAP_NONE is forbidden, the internal variable should not be set
if this value is given as parameter.
---

diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 054d219..2ac88a4 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1607,7 +1607,7 @@ EOLIAN static void
 _elm_popup_content_text_wrap_type_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Wrap_Type wrap)
 {
    //Need to wrap the content text, so not allowing ELM_WRAP_NONE
-   if (sd->content_text_wrap_type == ELM_WRAP_NONE) return;
+   if (wrap == ELM_WRAP_NONE) return;
 
    sd->content_text_wrap_type = wrap;
    if (sd->text_content_obj)