forked from enlightenment/efl
lutin... release soname patch. verbose svn soname used right now
SVN revision: 40131
This commit is contained in:
parent
71f3c6b743
commit
b4d9964e70
|
@ -898,7 +898,7 @@ my_bt_15(void *data, Evas_Object *obj, void *event_info)
|
||||||
evas_object_show(bx);
|
evas_object_show(bx);
|
||||||
|
|
||||||
np = elm_notepad_add(win);
|
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_weight_set(np, 1.0, 1.0);
|
||||||
evas_object_size_hint_align_set(np, -1.0, -1.0);
|
evas_object_size_hint_align_set(np, -1.0, -1.0);
|
||||||
elm_box_pack_end(bx, np);
|
elm_box_pack_end(bx, np);
|
||||||
|
|
|
@ -56,12 +56,10 @@ _buf_append(char *buf, const char *str, int *len, int *alloc)
|
||||||
int len2 = strlen(str);
|
int len2 = strlen(str);
|
||||||
if ((*len + len2) >= *alloc)
|
if ((*len + len2) >= *alloc)
|
||||||
{
|
{
|
||||||
char *buf2;
|
char *buf2 = realloc(buf, *alloc + len2 + 512);
|
||||||
|
|
||||||
buf2 = realloc(buf, *alloc + len2 + 512);
|
|
||||||
if (!buf2) return NULL;
|
if (!buf2) return NULL;
|
||||||
buf = buf2;
|
buf = buf2;
|
||||||
*alloc += 512;
|
*alloc += 512 + len2;
|
||||||
}
|
}
|
||||||
strcpy(buf + *len, str);
|
strcpy(buf + *len, str);
|
||||||
*len += len2;
|
*len += len2;
|
||||||
|
@ -73,7 +71,7 @@ _load_file(const char *file)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
size_t size;
|
size_t size;
|
||||||
int alloc = 0, len = 0, pos;
|
int alloc = 0, len = 0;
|
||||||
char *text = NULL, buf[4096];
|
char *text = NULL, buf[4096];
|
||||||
|
|
||||||
f = fopen(file, "rb");
|
f = fopen(file, "rb");
|
||||||
|
|
|
@ -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_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
|
// 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
|
// that lives under it from the handler... nasty. deferring doesnt help either
|
||||||
ecore_job_add(_deferred_ecore_evas_free, win->ee);
|
ecore_job_add(_deferred_ecore_evas_free, win->ee);
|
||||||
|
|
Loading…
Reference in New Issue