fix hash calls, fix object leak. :)

SVN revision: 18162
This commit is contained in:
Carsten Haitzler 2005-10-31 07:06:52 +00:00
parent c198ded7af
commit 09602687a0
2 changed files with 5 additions and 5 deletions

View File

@ -74,7 +74,8 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List **active
evas_object_clip_recalc(obj);
/* build active object list */
is_active = evas_object_is_active(obj);
if (is_active) *active_objects = evas_list_append(*active_objects, obj);
if ((is_active) || (obj->delete_me != 0))
*active_objects = evas_list_append(*active_objects, obj);
if (restack)
{
obj->restack = 1;

View File

@ -164,8 +164,8 @@ evas_hash_del(Evas_Hash *hash, const char *key, const void *data)
for (l = hash->buckets[hash_num]; l; l = l->next)
{
el = (Evas_Hash_El *)l;
if ((((el->key) && (key) && (!strcmp(el->key, key))) ||
((!el->key) && (!key))) && (el->data == data))
if (((el->key) && (key) && (!strcmp(el->key, key))) ||
((!key) && (el->data == data)))
{
hash->buckets[hash_num] = evas_object_list_remove(hash->buckets[hash_num], el);
if (el->key) free(el->key);
@ -240,8 +240,7 @@ evas_hash_modify(Evas_Hash *hash, const char *key, const void *data)
for (l = hash->buckets[hash_num]; l; l = l->next)
{
el = (Evas_Hash_El *)l;
if (((el->key) && (key) && (!strcmp(el->key, key))) ||
((!el->key) && (!key)))
if ((el->key) && (key) && (!strcmp(el->key, key)))
{
void *old_data;