Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c
Log Message:
call deactivate if activate fails
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_menu.c 8 Oct 2006 06:12:25 -0000 1.69
+++ e_menu.c 8 Oct 2006 06:43:31 -0000 1.70
@@ -181,6 +181,11 @@
_e_menu_activate_time = 0;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
+ if (!m->zone)
+ {
+ e_menu_deactivate(m);
+ return;
+ }
switch (dir)
{
case E_MENU_POP_DIRECTION_LEFT:
@@ -245,6 +250,11 @@
_e_menu_activate_time = activate_time;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
+ if (!m->zone)
+ {
+ e_menu_deactivate(m);
+ return;
+ }
switch (dir)
{
case E_MENU_POP_DIRECTION_LEFT:
@@ -302,6 +312,11 @@
_e_menu_activate_time = 0;
_e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
+ if (!m->zone)
+ {
+ e_menu_deactivate(m);
+ return;
+ }
switch (dir)
{
case E_MENU_POP_DIRECTION_LEFT:
@@ -1713,7 +1728,6 @@
{
ecore_x_window_del(_e_menu_win);
_e_menu_win = 0;
- m->zone = zone;
return;
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
