Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c buttons.c config.c main.c session.c
Log Message:
Prepare for theme version bump.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- backgrounds.c 6 Mar 2005 21:29:44 -0000 1.19
+++ backgrounds.c 19 Mar 2005 11:10:11 -0000 1.20
@@ -1304,7 +1304,8 @@
break;
case ESIGNAL_EXIT:
- BackgroundsConfigSave();
+ if (Mode.wm.save_ok)
+ BackgroundsConfigSave();
break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- buttons.c 6 Mar 2005 21:29:44 -0000 1.52
+++ buttons.c 19 Mar 2005 11:10:11 -0000 1.53
@@ -1129,7 +1129,8 @@
break;
case ESIGNAL_EXIT:
- ButtonsConfigSave();
+ if (Mode.wm.save_ok)
+ ButtonsConfigSave();
break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- config.c 5 Mar 2005 12:19:47 -0000 1.129
+++ config.c 19 Mar 2005 11:10:11 -0000 1.130
@@ -241,7 +241,7 @@
int i1, i2, fields;
char s[FILEPATH_LEN_MAX];
int e_cfg_ver = 0;
- int min_e_cfg_ver = 0;
+ int max_e_cfg_ver = 1;
while (GetLine(s, sizeof(s), fs))
{
@@ -276,32 +276,26 @@
}
if (i2 == CONFIG_OPEN)
{
- if (e_cfg_ver != min_e_cfg_ver)
+ if (e_cfg_ver > max_e_cfg_ver)
{
AlertX(_("Theme versioning ERROR"),
_("Restart with Defaults"), " ",
_("Abort and Exit"),
_("ERROR:\n" "\n"
- "The configuration for the theme you are "
- "running is\n"
- "incompatible. It's config revision is %i. "
- "It needs to\n"
- "be marked as being revision %i\n" "\n"
- "Please contact the theme author or "
- "maintainer and\n"
- "inform them that in order for their theme "
- "to function\n"
- "with this version of Enlightenment, they "
- "have to\n"
- "update it to the current settings, and "
- "then match\n" "the revision number.\n" "\n"
- "If the theme revision is higher than "
- "Enlightenment's\n"
- "it may be that you haven't upgraded "
- "Enlightenment for\n"
+ "The configuration for the theme you are running
is\n"
+ "incompatible. It's config revision is %i.\n"
+ "It needs to be marked as being revision <= %i\n"
+ "\n"
+ "Please contact the theme author or maintainer and\n"
+ "inform them that in order for their theme to
function\n"
+ "with this version of Enlightenment, they have to\n"
+ "update it to the current settings, and then match\n"
+ "the revision number.\n" "\n"
+ "If the theme revision is higher than
Enlightenment's\n"
+ "it may be that you haven't upgraded Enlightenment
for\n"
"a while and this theme takes advantages of new\n"
"features in Enlightenment in new versions.\n"),
- e_cfg_ver, min_e_cfg_ver);
+ e_cfg_ver, max_e_cfg_ver);
SessionExit(EEXIT_THEME, "DEFAULT");
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- main.c 18 Mar 2005 21:43:43 -0000 1.117
+++ main.c 19 Mar 2005 11:10:12 -0000 1.118
@@ -284,7 +284,7 @@
StartupWindowsOpen();
Conf.startup.firsttime = 0;
- Mode.wm.save_ok = 1;
+ Mode.wm.save_ok = Conf.autosave;
Mode.wm.startup = 0;
autosave();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- session.c 5 Mar 2005 12:19:48 -0000 1.93
+++ session.c 19 Mar 2005 11:10:12 -0000 1.94
@@ -296,7 +296,7 @@
void
autosave(void)
{
- if (!Mode.wm.save_ok || !Conf.autosave)
+ if (!Mode.wm.save_ok)
return;
if (EventDebug(EDBUG_TYPE_SESSION))
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
