summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-08-04 15:34:57 +0100
committerTom Hacohen <tom@stosb.com>2015-08-04 15:35:50 +0100
commitd1afa0e19b3f3f6476551857a4fc0b860ebf84ac (patch)
treed60701cf512ff2bc96235384fae13cbf222fc6d8
parent4284f11ca90af2764301365f3a6916ac43ac22f2 (diff)
Edje entry: Clean up conditions a bit.
Merge two conditions to clean up the code a bit.
-rw-r--r--src/lib/edje/edje_entry.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index eab317f028..c095f1621d 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
245 eina_unicode_utf8_get_len(info->change.insert.content); 245 eina_unicode_utf8_get_len(info->change.insert.content);
246 } 246 }
247 } 247 }
248 if (have_sel) 248 if (info)
249 { 249 {
250 if (info) 250 if (have_sel)
251 { 251 {
252 info->merge = EINA_TRUE; 252 info->merge = EINA_TRUE;
253 } 253 }
254 info->change.insert.pos =
255 evas_textblock_cursor_pos_get(en->cursor);
254 } 256 }
255 if (info)
256 info->change.insert.pos =
257 evas_textblock_cursor_pos_get(en->cursor);
258 if (fmtpre) _text_filter_format_prepend(ed, en, en->cursor, fmtpre); 257 if (fmtpre) _text_filter_format_prepend(ed, en, en->cursor, fmtpre);
259 evas_object_textblock_text_markup_prepend(c, text); 258 evas_object_textblock_text_markup_prepend(c, text);
260 free(text); 259 free(text);