diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 49d839037d..4ec3361a55 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -898,7 +898,7 @@ my_bt_15(void *data, Evas_Object *obj, void *event_info) evas_object_show(bx); np = elm_notepad_add(win); - elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_MARKUP_UTF8); + elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8); evas_object_size_hint_weight_set(np, 1.0, 1.0); evas_object_size_hint_align_set(np, -1.0, -1.0); elm_box_pack_end(bx, np); diff --git a/legacy/elementary/src/lib/elc_notepad.c b/legacy/elementary/src/lib/elc_notepad.c index 4bf3b2a123..8c17e3bec7 100644 --- a/legacy/elementary/src/lib/elc_notepad.c +++ b/legacy/elementary/src/lib/elc_notepad.c @@ -56,12 +56,10 @@ _buf_append(char *buf, const char *str, int *len, int *alloc) int len2 = strlen(str); if ((*len + len2) >= *alloc) { - char *buf2; - - buf2 = realloc(buf, *alloc + len2 + 512); + char *buf2 = realloc(buf, *alloc + len2 + 512); if (!buf2) return NULL; buf = buf2; - *alloc += 512; + *alloc += 512 + len2; } strcpy(buf + *len, str); *len += len2; @@ -73,7 +71,7 @@ _load_file(const char *file) { FILE *f; size_t size; - int alloc = 0, len = 0, pos; + int alloc = 0, len = 0; char *text = NULL, buf[4096]; f = fopen(file, "rb"); diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 876a394be0..470608e95e 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -86,6 +86,10 @@ _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_inf { evas_object_del(evas_object_top_get(win->evas)); } + evas_image_cache_flush(win->evas); + evas_font_cache_flush(win->evas); + edje_file_cache_flush(); + edje_collection_cache_flush(); // FIXME: we are in the del handler for the object and delete the canvas // that lives under it from the handler... nasty. deferring doesnt help either ecore_job_add(_deferred_ecore_evas_free, win->ee);