Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h mod-misc.c session.c settings.c
Log Message:
Session script changes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -3 -r1.510 -r1.511
--- E.h 6 Nov 2005 18:12:10 -0000 1.510
+++ E.h 9 Nov 2005 20:36:35 -0000 1.511
@@ -68,7 +68,7 @@
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
-#define ENABLE_OLD_SESSION_HELPERS 1
+#define ENABLE_OLD_SESSION_HELPERS 0
/* dmalloc debugging */
/*#include <dmalloc.h> */
@@ -500,9 +500,10 @@
} place;
struct
{
+ char enable_script;
+ char *script;
char enable_logout_dialog;
char enable_reboot_halt;
- char *cmd;
#if ENABLE_OLD_SESSION_HELPERS
char *cmd_init;
char *cmd_start;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-misc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- mod-misc.c 6 Nov 2005 18:12:12 -0000 1.24
+++ mod-misc.c 9 Nov 2005 20:36:35 -0000 1.25
@@ -131,9 +131,10 @@
CFG_ITEM_BOOL(Conf, place.ignore_struts, 0),
CFG_ITEM_BOOL(Conf, place.raise_fullscreen, 0),
+ CFG_ITEM_BOOL(Conf, session.enable_script, 0),
+ CFG_ITEM_STR(Conf, session.script),
CFG_ITEM_BOOL(Conf, session.enable_logout_dialog, 1),
CFG_ITEM_BOOL(Conf, session.enable_reboot_halt, 0),
- CFG_ITEM_STR(Conf, session.cmd),
#if ENABLE_OLD_SESSION_HELPERS
CFG_ITEM_STR(Conf, session.cmd_init),
CFG_ITEM_STR(Conf, session.cmd_start),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- session.c 6 Nov 2005 18:12:12 -0000 1.110
+++ session.c 9 Nov 2005 20:36:35 -0000 1.111
@@ -712,6 +712,8 @@
LoadWindowStates();
#endif
+ if (!Conf.session.script)
+ Conf.session.script = Estrdup("$EROOT/scripts/session.sh");
if (!Conf.session.cmd_reboot)
Conf.session.cmd_reboot = Estrdup("reboot");
if (!Conf.session.cmd_halt)
@@ -1036,24 +1038,24 @@
switch (when)
{
case ESESSION_INIT:
- if (Conf.session.cmd)
- SessionRunProg(Conf.session.cmd, "init");
+ if (Conf.session.enable_script && Conf.session.script)
+ SessionRunProg(Conf.session.script, "init");
#if ENABLE_OLD_SESSION_HELPERS
else if (Conf.session.cmd_init)
SessionRunProg(Conf.session.cmd_init, NULL);
#endif
break;
case ESESSION_START:
- if (Conf.session.cmd)
- SessionRunProg(Conf.session.cmd, "start");
+ if (Conf.session.enable_script && Conf.session.script)
+ SessionRunProg(Conf.session.script, "start");
#if ENABLE_OLD_SESSION_HELPERS
else if (Conf.session.cmd_start)
SessionRunProg(Conf.session.cmd_start, NULL);
#endif
break;
case ESESSION_STOP:
- if (Conf.session.cmd)
- SessionRunProg(Conf.session.cmd, "stop");
+ if (Conf.session.enable_script && Conf.session.script)
+ SessionRunProg(Conf.session.script, "stop");
#if ENABLE_OLD_SESSION_HELPERS
else if (Conf.session.cmd_stop)
SessionRunProg(Conf.session.cmd_stop, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- settings.c 30 Oct 2005 19:40:49 -0000 1.146
+++ settings.c 9 Nov 2005 20:36:35 -0000 1.147
@@ -478,9 +478,10 @@
}
static char tmp_dialog_headers;
+static char tmp_button_image;
+static char tmp_session_script;
static char tmp_logout_dialog;
static char tmp_reboot_halt;
-static char tmp_button_image;
static char tmp_animate_startup;
static char tmp_saveunders;
@@ -490,9 +491,10 @@
if (val < 2)
{
Conf.dialogs.headers = tmp_dialog_headers;
+ Conf.dialogs.button_image = tmp_button_image;
+ Conf.session.enable_script = tmp_session_script;
Conf.session.enable_logout_dialog = tmp_logout_dialog;
Conf.session.enable_reboot_halt = tmp_reboot_halt;
- Conf.dialogs.button_image = tmp_button_image;
Conf.startup.animate = tmp_animate_startup;
Conf.save_under = tmp_saveunders;
}
@@ -516,9 +518,10 @@
SoundPlay("SOUND_SETTINGS_MISCELLANEOUS");
tmp_dialog_headers = Conf.dialogs.headers;
+ tmp_button_image = Conf.dialogs.button_image;
+ tmp_session_script = Conf.session.enable_script;
tmp_logout_dialog = Conf.session.enable_logout_dialog;
tmp_reboot_halt = Conf.session.enable_reboot_halt;
- tmp_button_image = Conf.dialogs.button_image;
tmp_animate_startup = Conf.startup.animate;
tmp_saveunders = Conf.save_under;
@@ -542,6 +545,14 @@
DialogItemSetText(di, _("Enable Button Images"));
DialogItemCheckButtonSetPtr(di, &tmp_button_image);
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetColSpan(di, 2);
+ DialogItemSetText(di, _("Enable Session Script"));
+ DialogItemCheckButtonSetPtr(di, &tmp_session_script);
+
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Logout Dialog"));
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
