[Pkg-e-commits] [SCM] Enlightenment DR17 toolkit based (based on the EFL) branch, upstream-vcs, updated. 447de88121d145a078f1754a0cfebb704d363821

pfritz pfritz at alioth.debian.org
Sat Jun 7 18:34:01 UTC 2008


The following commit has been merged in the upstream-vcs branch:
commit 8b734d7ba636bb4612285353f0a6e68d77213603
Author: pfritz <pfritz>
Date:   Thu Apr 17 13:23:55 2008 +0000

    reset the file and the key of the theme object, when it gets cached
    (this fix the remembered state bug of the menu)

diff --git a/src/lib/ewl_embed.c b/src/lib/ewl_embed.c
index d537f21..4769778 100644
--- a/src/lib/ewl_embed.c
+++ b/src/lib/ewl_embed.c
@@ -5,6 +5,7 @@
 #include "ewl_debug.h"
 
 #include <Evas.h>
+#include <Edje.h>
 
 static int ewl_embed_last_mouse_x = 0;
 static int ewl_embed_last_mouse_y = 0;
@@ -1235,6 +1236,11 @@ ewl_embed_object_cache(Ewl_Embed *e, void *obj)
 		const char *type;
 
 		type = evas_object_type_get(obj);
+
+		/* reset the file and the key of the edje object */
+		if (!strcmp(type, "edje"))
+			edje_object_file_set(obj, "", "");
+
 		obj_list = ecore_hash_get(e->obj_cache, (void *)type);
 		if (!obj_list) {
 			obj_list = ecore_list_new();
@@ -1798,6 +1804,7 @@ ewl_embed_desktop_size_get(Ewl_Embed *e, int *w, int *h)
 
 	DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
+
 /**
  * @param e: the embed to freeze redraws and canvas events
  * @return Returns no value.
@@ -1814,7 +1821,6 @@ ewl_embed_freeze(Ewl_Embed *e)
 	 * Global freeze on theme events while theme's are being manipulated.
 	 */
 	ewl_engine_theme_freeze(e);
-
 	ewl_engine_canvas_freeze(e);
 
 	DLEAVE_FUNCTION(DLEVEL_STABLE);

-- 
Enlightenment DR17 toolkit based (based on the EFL)



More information about the Pkg-e-commits mailing list