chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error/fatal/info -> disorder_error/fatal/info
[disorder]
/
disobedience
/
settings.c
diff --git
a/disobedience/settings.c
b/disobedience/settings.c
index 71b953d1fe8416524cec6219872d58f93ded9341..2c4ffeb3c32f2d2e50e680e8d28ce8e03579918c 100644
(file)
--- a/
disobedience/settings.c
+++ b/
disobedience/settings.c
@@
-219,25
+219,25
@@
void load_settings(void) {
if(!strcmp(vec[0], "color")) {
GdkColor *color;
if(nvec != 7) {
if(!strcmp(vec[0], "color")) {
GdkColor *color;
if(nvec != 7) {
- error(0, "%s: malformed '%s' command", path, vec[0]);
+
disorder_
error(0, "%s: malformed '%s' command", path, vec[0]);
continue;
}
for(n = 0; n < NSTYLES && strcmp(styles[n].name, vec[1]); ++n)
;
if(n >= NSTYLES) {
continue;
}
for(n = 0; n < NSTYLES && strcmp(styles[n].name, vec[1]); ++n)
;
if(n >= NSTYLES) {
- error(0, "%s: unknown style '%s'", path, vec[1]);
+
disorder_
error(0, "%s: unknown style '%s'", path, vec[1]);
continue;
}
for(m = 0; m < NSTATES && strcmp(states[m], vec[2]); ++m)
;
if(m >= NSTATES) {
continue;
}
for(m = 0; m < NSTATES && strcmp(states[m], vec[2]); ++m)
;
if(m >= NSTATES) {
- error(0, "%s: unknown state '%s'", path, vec[2]);
+
disorder_
error(0, "%s: unknown state '%s'", path, vec[2]);
continue;
}
for(c = 0; c < NCOLORS && strcmp(colors[c].name, vec[3]); ++c)
;
if(c >= NCOLORS) {
continue;
}
for(c = 0; c < NCOLORS && strcmp(colors[c].name, vec[3]); ++c)
;
if(c >= NCOLORS) {
- error(0, "%s: unknown color '%s'", path, vec[3]);
+
disorder_
error(0, "%s: unknown color '%s'", path, vec[3]);
continue;
}
color = (GdkColor *)((char *)styles[n].style + colors[c].offset) + m;
continue;
}
color = (GdkColor *)((char *)styles[n].style + colors[c].offset) + m;
@@
-246,13
+246,13
@@
void load_settings(void) {
color->blue = strtoul(vec[6], 0, 0);
} else if(!strcmp(vec[0], "browser")) {
if(nvec != 2) {
color->blue = strtoul(vec[6], 0, 0);
} else if(!strcmp(vec[0], "browser")) {
if(nvec != 2) {
- error(0, "%s: malformed '%s' command", path, vec[0]);
+
disorder_
error(0, "%s: malformed '%s' command", path, vec[0]);
continue;
}
browser = vec[1];
} else
/* mention errors but otherwise ignore them */
continue;
}
browser = vec[1];
} else
/* mention errors but otherwise ignore them */
- error(0, "%s: unknown command '%s'", path, vec[0]);
+
disorder_
error(0, "%s: unknown command '%s'", path, vec[0]);
}
if(ferror(fp)) {
fpopup_msg(GTK_MESSAGE_ERROR, "error reading %s: %s",
}
if(ferror(fp)) {
fpopup_msg(GTK_MESSAGE_ERROR, "error reading %s: %s",