Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 05:28:32 +00:00
Code Issues Releases Activity
2,278 Commits 5 Branches 46 Tags
Commit Graph

2278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolas Garofil
ba06e0acad Fix removing the config and sending a SIGUSR1 results in segfault 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
 2010-02-23 14:41:11 +01:00
Nikolas Garofil
72f5aa7ece Fix removing the config and sending a SIGUSR1 results in segfault 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
 2010-02-23 14:38:08 +01:00
Cesare Tirabassi
8ca6ea6aec Fix LP: #525926; conky sigsegv if config file is deleted 
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
(cherry picked from commit 085c39d39464642746a1883266d9dffcfc10e84c)
 2010-02-22 22:48:32 +01:00
Cesare Tirabassi
085c39d394 Fix LP: #525926; conky sigsegv if config file is deleted 
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
 2010-02-22 22:45:51 +01:00
Nikolas Garofil
d35aad5bfa Fix wrong output when nesting $combine-s 2010-02-22 19:35:36 +01:00
Nikolas Garofil
29f013b34d Fix wrong output when nesting $combine-s 2010-02-22 19:35:03 +01:00
Nikolas Garofil
80ee83c87f Fix memleak 2010-02-22 16:50:10 +01:00
Nikolas Garofil
7a8c1e45c8 Fix memleak 2010-02-22 16:49:38 +01:00
Nikolas Garofil
87a33551f7 Fix output of $combine when used in combination with $head 2010-02-22 16:35:25 +01:00
Nikolas Garofil
f48124bdea Fix output of $combine when used in combination with $head 2010-02-22 16:34:14 +01:00
Nikolas Garofil
caf38b3a12 Fix current_mail_spool memleak 2010-02-18 01:34:19 +01:00
Nikolas Garofil
7bf902f14a Fix current_mail_spool memleak 2010-02-18 01:33:49 +01:00
Nikolas Garofil
53e4299162 Fix memleak in if_match 2010-02-17 20:36:01 +01:00
Nikolas Garofil
597586f289 Fix memleak in if_match 2010-02-17 20:34:53 +01:00
Pavel Labath
b1a07a1750 Update docs to be consistent with changes in previous commit 2010-02-17 19:56:20 +01:00
Pavel Labath
eb0b439716 Update docs to be consistent with changes in previous commit 2010-02-17 19:56:09 +01:00
Pavel Labath
7bec4e0be8 Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:45:22 +01:00
Pavel Labath
3b7454fd9b Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:44:22 +01:00
Ben Kibbey
edaf742295 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:32:01 -08:00
Ben Kibbey
93d8b01f48 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:31:52 -08:00
Cesare Tirabassi
2c33e6e565 Fix last commit which fails to build when X11 is not enabled 
(cherry picked from commit 925e80ac11f53726515d33d9d59081e65872718c)
 2010-02-17 12:43:53 +01:00
Cesare Tirabassi
925e80ac11 Fix last commit which fails to build when X11 is not enabled 2010-02-17 12:38:05 +01:00
Nikolas Garofil
ac6dff791f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:22 +01:00
Nikolas Garofil
29ef435c8f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:02 +01:00
Nikolas Garofil
656177e0de Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:04:25 +01:00
Nikolas Garofil
96c059773b Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:03:31 +01:00
Pavel Labath
6526b47b2c Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:38:15 +01:00
Pavel Labath
ab55088784 Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:36:04 +01:00
Cesare Tirabassi
d2ce1d2909 Replaces commit 44e3708cdb204782d728ddd6a40dec230bb9299c 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
(cherry picked from commit 1eedf2633bfe822d80f6215d53730de473207f25)
 2010-01-31 21:00:37 +01:00
Cesare Tirabassi
1eedf2633b Replaces commit 44e3708cdb204782d728ddd6a40dec230bb9299c 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
 2010-01-31 20:57:02 +01:00
Cesare Tirabassi
da510d34a6 Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
(cherry picked from commit 99fd8ef38080a873bee67cd7742e5c67048aeb63)
 2010-01-31 12:00:29 +01:00
Cesare Tirabassi
99fd8ef380 Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
 2010-01-31 11:57:09 +01:00
Brenden Matthews
b44b85c74f Bump for an RC3, if needed. 2010-01-30 11:12:59 -08:00
Cesare Tirabassi
9e5739e612 Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:27:01 +01:00
Cesare Tirabassi
9601693afa Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0 2010-01-30 19:24:19 +01:00
Cesare Tirabassi
d620ac6f0f Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:23:31 +01:00
Pavel Labath
44a4ffae91 Merge branch '1.8.0' into 1.8.1 2010-01-30 17:56:22 +01:00
Pavel Labath
fcc6524db2 Fix small logic error in diskiograph_read/write 2010-01-30 17:48:03 +01:00
Cesare Tirabassi
3db07e589f Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 
(cherry picked from commit 44e3708cdb204782d728ddd6a40dec230bb9299c)
 2010-01-30 14:24:40 +01:00
Brenden Matthews
8cb56def23 Only ever fork() once. 
(cherry picked from commit 000acfe0fd6fa0d6f6e284676af079e8ef9397d8)
 2010-01-30 14:24:06 +01:00
Cesare Tirabassi
44e3708cdb Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 2010-01-30 14:19:38 +01:00
Brenden Matthews
c5925930c3 Merge branch '1.8.0' into 1.8.1 
Conflicts:
	src/conky.c
 2010-01-26 13:05:59 -08:00
Brenden Matthews
000acfe0fd Only ever fork() once. 2010-01-26 13:05:04 -08:00
Brenden Matthews
61ad0c2159 Only pause during startup, not after reload. 2010-01-26 12:39:15 -08:00
Brenden Matthews
0ae9108874 Only pause during startup, not after reload. 2010-01-26 12:37:16 -08:00
Pavel Labath
60a6194b84 Add optional argument to $acpiacadapter 
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
 2010-01-24 16:12:31 +01:00
Pavel Labath
f5363b6539 Add optional argument to $acpiacadapter 
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
1.8.0_rc2 		2010-01-24 16:11:55 +01:00
Pavel Labath
ecbfe50ac7 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:07:34 +01:00
Pavel Labath
fb1ff85d05 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:06:16 +01:00
Nikolas Garofil
68416ee1f3 Bump version 2010-01-17 21:39:59 +01:00