Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
session.c
Log Message:
But log out buttons back in old order.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- session.c 29 Jan 2005 07:11:58 -0000 1.85
+++ session.c 6 Feb 2005 08:02:11 -0000 1.86
@@ -943,12 +943,23 @@
else
#endif /* HAVE_X11_SM_SMLIB_H */
{
- if (val == 1)
- SessionExit(EEXIT_EXIT, NULL);
- if (val == 2)
- SessionExit(EEXIT_EXEC, Conf.session.cmd_reboot);
- if (val == 3)
- SessionExit(EEXIT_EXEC, Conf.session.cmd_halt);
+ /* 0:LogOut -: No -or- */
+ /* 0:Halt 1:Reboot 2:LogOut -:No */
+ switch (val)
+ {
+ case 0:
+ if (Conf.session.enable_reboot_halt)
+ SessionExit(EEXIT_EXEC, Conf.session.cmd_halt);
+ else
+ SessionExit(EEXIT_EXIT, NULL);
+ break;
+ case 1:
+ SessionExit(EEXIT_EXEC, Conf.session.cmd_reboot);
+ break;
+ case 2:
+ SessionExit(EEXIT_EXIT, NULL);
+ break;
+ }
}
}
@@ -967,13 +978,13 @@
DialogSetText(d, _("\n\n"
" Are you sure you wish to log out ? \n"
"\n\n"));
- DialogAddButton(d, _(" No "), NULL, 1);
- DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1);
if (Conf.session.enable_reboot_halt)
{
- DialogAddButton(d, _(" Yes, Reboot "), LogoutCB, 1);
DialogAddButton(d, _(" Yes, Shut Down "), LogoutCB, 1);
+ DialogAddButton(d, _(" Yes, Reboot "), LogoutCB, 1);
}
+ DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1);
+ DialogAddButton(d, _(" No "), NULL, 1);
DialogBindKey(d, "Escape", DialogCallbackClose, 1);
DialogBindKey(d, "Return", LogoutCB, 0);
}
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
