From: Mike Blumenkrantz Date: Tue, 10 Mar 2015 22:29:09 +0000 (-0400) Subject: don't modify pixmap hash when changing pixmap parent window X-Git-Tag: upstream/0.20.0~1175 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d93bb6c89985fbda50ba375e0fc9eab227e70735;p=platform%2Fupstream%2Fenlightenment.git don't modify pixmap hash when changing pixmap parent window moderately certain I originally wrote this to work in the other direction and then failed to remove it when I switched to setting parents instead of children. regardless, pixmap hash should not be changed here --- diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index cfff95d..103c78b 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -179,7 +179,6 @@ e_pixmap_free(E_Pixmap *cp) if (!cp) return 0; if (--cp->refcount) return cp->refcount; e_pixmap_image_clear(cp, EINA_FALSE); - if (cp->parent) eina_hash_set(pixmaps[cp->type], &cp->parent, NULL); eina_hash_del_by_key(pixmaps[cp->type], &cp->win); return 0; } @@ -267,10 +266,7 @@ e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win) e_pixmap_usable_set(cp, 0); e_pixmap_clear(cp); - if (cp->parent) - eina_hash_set(pixmaps[cp->type], &cp->parent, NULL); cp->parent = win; - if (win) eina_hash_add(pixmaps[cp->type], &win, cp); } EAPI void