projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac6dff7
)
Fix last commit which fails to build when X11 is not enabled
author
Cesare Tirabassi
<norsetto@ubuntu.com>
Wed, 17 Feb 2010 11:38:05 +0000
(12:38 +0100)
committer
Cesare Tirabassi
<norsetto@ubuntu.com>
Wed, 17 Feb 2010 11:43:53 +0000
(12:43 +0100)
(cherry picked from commit
925e80ac11f53726515d33d9d59081e65872718c
)
src/conky.c
patch
|
blob
|
history
diff --git
a/src/conky.c
b/src/conky.c
index
11428ad
..
b9e1761
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-4507,6
+4507,7
@@
static int do_config_step(int *line, FILE *fp, char *buf, char **name, char **va
return 0;
}
+#ifdef X11
void setalignment(int* text_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
#ifdef OWN_WINDOW
if (windowtype == TYPE_DOCK) {
@@
-4527,6
+4528,7
@@
void setalignment(int* text_alignment, unsigned int windowtype, const char* valu
CONF_ERR;
}
}
+#endif /* X11 */
char load_config_file(const char *f)
{