Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c
Log Message:
Enough to keep track of active menu item.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_menu.c 9 Aug 2006 13:52:52 -0000 1.56
+++ e_menu.c 9 Aug 2006 13:56:23 -0000 1.57
@@ -86,7 +86,6 @@
/* local subsystem globals */
static Ecore_X_Window _e_menu_win = 0;
static Evas_List *_e_active_menus = NULL;
-static E_Menu *_e_active_menu = NULL;
static E_Menu_Item *_e_active_menu_item = NULL;
/*static Evas_Hash *_e_menu_category_items = NULL;*/
static Evas_Hash *_e_menu_categories = NULL;
@@ -145,7 +144,6 @@
e_object_unref(E_OBJECT(m));
}
_e_active_menus = NULL;
- _e_active_menu = NULL;
if (_e_menu_categories)
{
evas_hash_foreach(_e_menu_categories, _e_menu_categories_free_cb, NULL);
@@ -783,7 +781,6 @@
if (mi == pmi) return;
if (pmi) e_menu_item_active_set(pmi, 0);
mi->active = 1;
- _e_active_menu = mi->menu;
_e_active_menu_item = mi;
if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "active", "");
@@ -803,7 +800,6 @@
else if ((!active) && (mi->active))
{
mi->active = 0;
- _e_active_menu = NULL;
_e_active_menu_item = NULL;
if (mi->bg_object)
edje_object_signal_emit(mi->bg_object, "passive", "");
@@ -1005,7 +1001,6 @@
Evas_List *l, *tmp;
E_Menu_Category *cat;
- if (m == _e_active_menu) _e_active_menu = NULL;
/* the foreign menu items */
cat = evas_hash_find(_e_menu_categories, m->category);
if (cat)
@@ -2177,7 +2172,8 @@
static E_Menu *
_e_menu_active_get(void)
{
- return _e_active_menu;
+ if (_e_active_menu_item) return _e_active_menu_item->menu;
+ return NULL;
}
static E_Menu_Item *
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
