kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CEDIRC: SEGV CAUSING BUG. go to e17 font settings -> advanced 

and sewt a font for menu item.. or menu title. segv. (try it under
falgrind) the members list in the hash is garbage when its trying to
remove a member. double heck your changes and test :)



SVN revision: 59902
This commit is contained in:
Carsten Haitzler 2011-06-02 15:21:21 +00:00
parent 9bd8ccae80
commit 1b7ff0248e
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/ChangeLog
View File

@ -110,7 +110,3 @@
evas freeze and thaw calls. May help in certain pathological
situations.
2011-05-27 Cedric Bail
* Improve performance by avoiding walking eina_list for nothing
when deleting member_class.

2
legacy/edje/src/lib/edje_main.c
View File

@ -200,8 +200,6 @@ _edje_del(Edje *ed)
eina_stringshare_del(cb->part);
free(cb);
}
if (ed->members) eina_hash_free(ed->members);
free(ed);
}

2
legacy/edje/src/lib/edje_private.h
View File

@ -1004,8 +1004,6 @@ struct _Edje
int table_programs_size;
unsigned int table_parts_size;
Eina_Hash *members;
Edje_Perspective *persp;
struct {

25
legacy/edje/src/lib/edje_util.c
View File

@ -3674,38 +3674,33 @@ _edje_text_class_member_add(Edje *ed, const char *text_class)
/* Get members list */
members = eina_hash_find(_edje_text_class_member_hash, text_class);
/* Remove members list */
if (members)
eina_hash_del(_edje_text_class_member_hash, text_class, members);
/* Update the member list */
members = eina_list_prepend(members, ed);
/* Don't loose track of members list */
if (!ed->members)
ed->members = eina_hash_string_small_new(NULL);
eina_hash_set(ed->members, text_class, members);
/* Reset the member list to the right pointer */
/* Add the member list back */
if (!_edje_text_class_member_hash)
_edje_text_class_member_hash = eina_hash_string_superfast_new(NULL);
eina_hash_set(_edje_text_class_member_hash, text_class, members);
eina_hash_add(_edje_text_class_member_hash, text_class, members);
}
void
_edje_text_class_member_del(Edje *ed, const char *text_class)
{
Eina_List *members;
Eina_List *lookup;
if ((!ed) || (!text_class)) return;
members = eina_hash_find(_edje_text_class_member_hash, text_class);
if (!members) return;
lookup = eina_hash_find(ed->members, text_class);
eina_hash_del(_edje_text_class_member_hash, text_class, members);
if (!lookup) return ;
eina_hash_del(ed->members, text_class, lookup);
members = eina_list_remove_list(members, lookup);
eina_hash_set(_edje_text_class_member_hash, text_class, members);
members = eina_list_remove(members, ed);
if (members)
eina_hash_add(_edje_text_class_member_hash, text_class, members);
}
void