From af05c00f8a2a39b739a25ec36844643b9afe36ce Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 8 Dec 2008 23:46:46 +0000 Subject: [PATCH] patch from olof to fix paste :) SVN revision: 38033 --- data/themes/default.edc | 2 +- src/lib/elm_entry.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 7d4da5a..ae8941c 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -3637,7 +3637,7 @@ collections { type: TEXTBLOCK; mouse_events: 1; scale: 1; - entry_mode: PASSOWRD; + entry_mode: PASSWORD; multiline: 0; source: "elm/entry/selection/default"; // selection under source4: "elm/entry/cursor/default"; // cursorover diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 89e46a1..174cb1f 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -319,23 +319,20 @@ _text_to_mkup(const char *text) { char *str = NULL; int str_len = 0, str_alloc = 0; - int ch, pos = 0; + int ch, pos = 0, pos2 = 0; for (;;) { // FIXME: use evas_string_char_next_get() - ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos); + pos = pos2; + ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos2); if (ch <= 0) break; if (ch == '\n') str = _str_append(str, "
", &str_len, &str_alloc); else if (ch == '\t') str = _str_append(str, "<\t>", &str_len, &str_alloc); else { - int pos2; char tstr[16]; - pos2 = pos; - // FIXME: use evas_string_char_next_get() - ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos2); strncpy(tstr, text + pos, pos2 - pos); tstr[pos2 - pos] = 0; str = _str_append(str, tstr, &str_len, &str_alloc); -- 2.7.4