From: Enlightenment S. <no-...@en...> - 2008-12-08 23:46:50
|
Log: patch from olof to fix paste :) Author: raster Date: 2008-12-08 15:46:46 -0800 (Mon, 08 Dec 2008) New Revision: 38033 Modified: trunk/TMP/st/elementary/data/themes/default.edc trunk/TMP/st/elementary/src/lib/elm_entry.c Modified: trunk/TMP/st/elementary/data/themes/default.edc =================================================================== --- trunk/TMP/st/elementary/data/themes/default.edc 2008-12-08 23:45:48 UTC (rev 38032) +++ trunk/TMP/st/elementary/data/themes/default.edc 2008-12-08 23:46:46 UTC (rev 38033) @@ -3637,7 +3637,7 @@ 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 Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_entry.c 2008-12-08 23:45:48 UTC (rev 38032) +++ trunk/TMP/st/elementary/src/lib/elm_entry.c 2008-12-08 23:46:46 UTC (rev 38033) @@ -319,23 +319,20 @@ { 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, "<br>", &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); |