tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d1afa0e19b3f3f6476551857a4fc0b860ebf84ac
commit d1afa0e19b3f3f6476551857a4fc0b860ebf84ac
Author: Tom Hacohen <t...@stosb.com>
Date: Tue Aug 4 15:34:57 2015 +0100
Edje entry: Clean up conditions a bit.
Merge two conditions to clean up the code a bit.
---
src/lib/edje/edje_entry.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index eab317f..c095f16 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -245,16 +245,15 @@ _text_filter_markup_prepend_internal(Edje *ed, Entry *en,
Evas_Textblock_Cursor
eina_unicode_utf8_get_len(info->change.insert.content);
}
}
- if (have_sel)
+ if (info)
{
- if (info)
- {
- info->merge = EINA_TRUE;
- }
+ if (have_sel)
+ {
+ info->merge = EINA_TRUE;
+ }
+ info->change.insert.pos =
+ evas_textblock_cursor_pos_get(en->cursor);
}
- if (info)
- info->change.insert.pos =
- evas_textblock_cursor_pos_get(en->cursor);
if (fmtpre) _text_filter_format_prepend(ed, en, en->cursor, fmtpre);
evas_object_textblock_text_markup_prepend(c, text);
free(text);
--
