Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
main.c session.c
Log Message:
Fix remembered settings for slave WM's.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- main.c 5 Aug 2004 17:46:26 -0000 1.101
+++ main.c 27 Sep 2004 18:35:51 -0000 1.102
@@ -305,10 +305,7 @@
ECursorsInit();
ECsrApply(ECSR_ROOT, VRoot.win);
-#if 0 /* AAA: Why here? */
- Mode.wm.startup = 0;
-#endif
- Mode.wm.save_ok = Mode.wm.master;
+ Mode.wm.save_ok = 1;
/* ok - paranoia - save current settings to disk */
if (VRoot.scr == 0)
autosave();
@@ -363,9 +360,6 @@
if (Mode.firsttime)
runDocBrowser();
-#if 0 /* Not if AAA */
- Mode.wm.startup = 1;
-#endif
SpawnSnappedCmds();
Mode.wm.startup = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- session.c 15 Aug 2004 20:45:23 -0000 1.77
+++ session.c 27 Sep 2004 18:35:51 -0000 1.78
@@ -435,15 +435,15 @@
void
autosave(void)
{
- if (!Mode.wm.save_ok)
- return;
+ char s[4096];
- if (Conf.autosave)
- {
- char s[4096];
+ if (!Mode.wm.save_ok || !Conf.autosave)
+ return;
- Real_SaveSnapInfo(0, NULL);
+ Real_SaveSnapInfo(0, NULL);
+ if (Mode.wm.master)
+ {
Etmp(s);
SaveUserControlConfig(fopen(s, "w"));
if (EventDebug(EDBUG_TYPE_SESSION))
@@ -453,19 +453,6 @@
Alert(_("There was an error saving your autosave data - filing\n"
"system problems.\n"));
}
-#if 0 /* Why nuke it? */
- else
- {
-/* char buf[1024];
- *
- * Esnprintf(buf, sizeof(buf) / sizeof(char), "rm %s*", GetSMFile());
- * system(buf); */
-
- if (EventDebug(EDBUG_TYPE_SESSION))
- Eprintf("autosave: kill %s\n", GetGenericSMFile());
- E_rm(GetGenericSMFile());
- }
-#endif
}
#ifdef HAVE_X11_SM_SMLIB_H
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
