nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-30 20:10:45 +00:00
parent 0f9fbcbd25 5cfea9fad5
commit fb90a556c8
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cfgparse.y
View File

@ -552,15 +552,15 @@ void parse_file(const char *f) {
/* We need to convert this v3 configuration */ /* We need to convert this v3 configuration */
char *converted = migrate_config(new, stbuf.st_size); char *converted = migrate_config(new, stbuf.st_size);
if (converted != NULL) { if (converted != NULL) {
printf("\n"); ELOG("\n");
printf("****************************************************************\n"); ELOG("****************************************************************\n");
printf("NOTE: Automatically converted configuration file from v3 to v4.\n"); ELOG("NOTE: Automatically converted configuration file from v3 to v4.\n");
printf("\n"); ELOG("\n");
printf("Please convert your config file to v4. You can use this command:\n"); ELOG("Please convert your config file to v4. You can use this command:\n");
printf(" mv %s %s.O\n", f, f); ELOG(" mv %s %s.O\n", f, f);
printf(" i3-migrate-config-to-v4 %s.O > %s\n", f, f); ELOG(" i3-migrate-config-to-v4 %s.O > %s\n", f, f);
printf("****************************************************************\n"); ELOG("****************************************************************\n");
printf("\n"); ELOG("\n");
free(new); free(new);
new = converted; new = converted;
} else { } else {
@ -611,6 +611,9 @@ void parse_file(const char *f) {
} }
if (context->has_errors || context->has_warnings) { if (context->has_errors || context->has_warnings) {
ELOG("FYI: You are using i3 version " I3_VERSION "\n");
if (version == 3)
ELOG("Please convert your configfile first, then fix any remaining errors (see above).\n");
start_configerror_nagbar(f); start_configerror_nagbar(f);
} }