1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

2285 Commits

Author SHA1 Message Date
Ben Kibbey
6e6a1f59e8 Fix hddtemp with disabled drives.
Some drives are unable to return their temperature when in standby mode.
If there is more than one drive installed then other drives may not be
able to get parsed. This patch will skip over the unparsable output for
the current drive and let others get parsed.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-01 14:50:42 -08:00
Nikos Ntarmos
c7bf4092a4 Pattern substitution is a bash-ism; use sed instead.
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-01-01 14:43:05 -08:00
Brenden Matthews
d7f008e868 tolua++ has different naming convention on FreeBSD 2010-01-01 14:33:42 -08:00
Brenden Matthews
3efe71520f Deprecate autotools, update docs to reflect cmake build system. 2010-01-01 14:08:57 -08:00
Brenden Matthews
d92c2e6dab Minor CMake fixes.
- Only enable pedantic flags with MAINTAINER_MODE enabled
 - Hide APP_* vars.
2010-01-01 13:50:12 -08:00
Brenden Matthews
4d7d2b27f3 Minor build fix. 2010-01-01 13:45:16 -08:00
Cesare Tirabassi
72bbe51a8c The HAPPY NEW YEAR commit
This should close sf #2850092.
Basically, before this change, for strings which includes
SECRIT_MULTILINE_CHAR the computed maximum substring width was getting
summed to the width of the last substring.
The old behaviour is kept but for the case of strings including
SECRIT_MULTILINE_CHAR, for which now the maximum width of all substrings
is taken.
I don't think this will break anything else but blame me if it does ...
2009-12-31 23:49:02 +01:00
Phil Sutter
db2282968f parse the -D flag as early as possible
In fact, this will make -D being parsed at least before the conkyrc is
being read, allowing for debug-output from inside the config-parser. :)
2009-12-29 00:18:12 +01:00
Phil Sutter
6f587402d8 cosmetic fixup session
- kill trailing whitespace (grep -n ' $' src/*.{c,cc,h})
- eliminate space before tab (grep -n ' 	' src/*.{c,cc,h})
  (insert tab by pressing CTRL-v first)
- little indenting fixup in configure.ac.in (we indent using tabs, not
  spaces)

note: this should not change the actual code at all - if it does, feel
free to blame me personally ;)
2009-12-28 21:32:07 +01:00
Phil Sutter
7d92e46533 include llua.h where it's really needed 2009-12-28 21:31:49 +01:00
Phil Sutter
46bd87b05e move extract_object_args_to_sub() to a more convenient place 2009-12-28 03:02:06 +01:00
Phil Sutter
0d2770ab33 fix check for iwlib and output some more detailed errors 2009-12-28 03:02:06 +01:00
Phil Sutter
c4c2377d0e drop commas at end of enum in top.h 2009-12-28 03:02:06 +01:00
Phil Sutter
dcb35db39d check return value of write() 2009-12-28 03:02:05 +01:00
Phil Sutter
e99118cf2e fix for unused results in tailhead.c 2009-12-28 03:02:05 +01:00
Phil Sutter
1ff3f84068 fix for unused results in mboxscan.c 2009-12-28 03:02:05 +01:00
Phil Sutter
43ee33a28d check return type of dup() in exec.c 2009-12-28 03:02:05 +01:00
Phil Sutter
ac8bb1489d fix for unused results in eve.c 2009-12-28 03:02:05 +01:00
Phil Sutter
6e53e3278d implement a safe_asprintf for timeinfo.c 2009-12-28 03:02:05 +01:00
Phil Sutter
aa95dde706 fix for unused results in smapi.c 2009-12-28 03:02:05 +01:00
Phil Sutter
8662e6630e fix for unused results in linux.c 2009-12-28 03:02:05 +01:00
Phil Sutter
c986aa6346 fix unused result warnings in mail.c 2009-12-28 03:02:05 +01:00
Cesare Tirabassi
c8a99a865a Fix some typos in documentation 2009-12-27 23:07:16 +01:00
Cesare Tirabassi
7adbbc5198 Fix WEATHER not defined for BUILD_WEATHER_XOAP 2009-12-20 15:07:43 +01:00
Phil Sutter
37355406a8 conky compiles fine here with gcc-4.3.4 2009-12-20 02:23:25 +01:00
Phil Sutter
2c83899458 cmake: fix obvious mistake in config.h.in 2009-12-20 02:23:25 +01:00
Phil Sutter
243a234352 cmake: fix for imlib2
- on my system, libImlib2.so is written with a capitalised I
- IMLIB2_LIB is empty, but IMLIB2_LDFLAGS contains what we need
2009-12-20 02:23:25 +01:00
Cesare Tirabassi
52e3cd36c4 The tolua++ helper is called tolua++5.1 on some distro 2009-12-20 00:58:40 +01:00
Brenden Matthews
c72ad5ddc6 Add missing CMake file. 2009-12-19 11:44:40 -08:00
Brenden Matthews
4d0924f6b0 More work on CMake build system (possibly finished?). 2009-12-19 11:39:16 -08:00
Brenden Matthews
fb33419cd4 Add CMake build support for Lua bindings. 2009-12-17 19:46:26 -08:00
Brenden Matthews
32c5f451b9 Minor build fixes 2009-12-17 18:55:54 -08:00
Brenden Matthews
51ff65ede0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-12-17 18:52:05 -08:00
Phil Sutter
0522832350 cleanup apcupsd a bit, fix some whitespace errors 2009-12-17 23:07:15 +01:00
Phil Sutter
9b66a4715b hide smapi internal functions and cleanup header 2009-12-17 22:45:00 +01:00
Phil Sutter
861988be24 font_h could be used uninitialised (so it says) 2009-12-17 22:42:52 +01:00
Phil Sutter
bf1e5108ab we shall not ignore the return value of functions declared with warn_unused_result 2009-12-17 22:42:52 +01:00
Phil Sutter
1724a1fe49 ISO C++ forbids variable length arrays 2009-12-17 22:42:52 +01:00
Phil Sutter
de049dcbde --enable-testing rejects commas at end of enumerator lists 2009-12-17 22:42:47 +01:00
Phil Sutter
3bc141cb7b use -std=c++0x for C++ sources
This is for --enable-testing, as we use C99 features (anonymous variadic
macros, in logging.h).
2009-12-17 22:14:22 +01:00
Phil Sutter
4229fbd380 introduce a generic priority queue implementation 2009-12-13 17:10:45 +01:00
Phil Sutter
bb72583a95 simplify this conditional a bit 2009-12-13 03:42:14 +01:00
Phil Sutter
bad6d62b31 little header cleanup in conky.cc 2009-12-13 02:54:48 +01:00
Phil Sutter
510d617c74 fix doc typo and add highlighting for times_in_seconds 2009-12-13 00:28:01 +01:00
Phil Sutter
8bc17ca311 top: add update callbacks conditionally, drop useless check 2009-12-12 19:50:36 +01:00
Phil Sutter
8045e7f714 drop enum text_object_type and all references to it's members
After some minor rewrite of the top parser (which was in fact the only
real user of the obj->type field left since introduction of text object
callbacks), there is no need for the obj->type field anymore.
2009-12-12 15:56:00 +01:00
Phil Sutter
5c86a80614 fix $scroll color reset (add missing callback) 2009-12-12 15:43:39 +01:00
Pavel Labath
52b5fe11ed Fix race condition in update_stat() 2009-12-11 22:54:11 +01:00
Pavel Labath
a49000ba22 Eliminate warnings in mail.c
PS: functions pop3_thread and imap_thread look ridiculously similar. It may be worth merging them
at some point.
2009-12-11 21:34:41 +01:00
Pavel Labath
95f1930220 Set -std compiler options for all build types, not just debug 2009-12-11 18:08:19 +01:00