Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-13 15:21:42 -06:00
commit 73194dee89
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conky.c
View File

@ -8013,9 +8013,12 @@ static void load_config_file(const char *f)
}
}
CONF("alignment") {
#ifdef OWN_WINDOW
if (window.type == TYPE_DOCK)
;
else if (value) {
else
#endif /*OWN_WINDOW */
if (value) {
int a = string_to_alignment(value);
if (a <= 0) {

2
src/x11.c
View File

@ -626,6 +626,7 @@ void update_x11info(void)
}
#ifdef OWN_WINDOW
/* reserve window manager space */
void set_struts(int sidenum)
{
@ -698,3 +699,4 @@ void set_struts(int sidenum)
}
}
}
#endif /* OWN_WINDOW */