Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_sys.c
Log Message:
finish halt_now
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_sys.c 8 Jul 2008 14:00:53 -0000 1.12
+++ e_sys.c 8 Jul 2008 15:48:39 -0000 1.13
@@ -71,7 +71,6 @@
case E_SYS_LOGOUT:
return 0;
case E_SYS_HALT:
- return _e_sys_can_halt;
case E_SYS_HALT_NOW:
return _e_sys_can_halt;
case E_SYS_REBOOT:
@@ -150,6 +149,7 @@
{
if (ev->exit_code != 0) _e_sys_action_failed();
if (((_e_sys_action_current != E_SYS_HALT) &&
+ (_e_sys_action_current != E_SYS_HALT_NOW) &&
(_e_sys_action_current != E_SYS_REBOOT)) ||
(ev->exit_code != 0))
{
@@ -364,6 +364,7 @@
);
break;
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_("Enlightenment is shutting the system down.<br>"
"You cannot do any other system actions<br>"
@@ -417,6 +418,7 @@
switch (_e_sys_action_current)
{
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_("Shutting down of your system failed.")
);
@@ -470,6 +472,7 @@
_e_sys_logout_begin(E_SYS_EXIT);
break;
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
/* shutdown -h now */
if (e_util_immortal_check()) return 0;
snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
