Phil Sutter
ae7996bdd1
fix hwmon for 2.6.29, simplify code a bit
2009-05-12 00:49:40 +02:00
Nikolas Garofil
a01f968677
Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627)
2009-05-11 19:47:24 +02:00
Nikolas Garofil
ae1b6c50e6
Remove even more x11-stuff with --disable-x11
2009-05-11 18:37:12 +02:00
Brenden Matthews
a25b33f646
Ammend AUTHORS.
2009-05-10 13:41:37 -06:00
Jaromir Smrcek
22601ff864
APC UPS fixes.
2009-05-10 13:37:04 -06:00
Brenden Matthews
bd7adc5fbb
Add note to git readme about doc generation.
2009-05-10 13:24:31 -06:00
Nikolas Garofil
829201517e
no x11-stuff for apcupsd when disabled
2009-05-10 21:18:20 +02:00
Brenden Matthews
8cb0027f45
Various fixes.
...
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
2009-05-10 13:11:09 -06:00
Jaromir Smrcek
cf2c61b588
Added support for APC UPS daemon monitoring.
2009-05-10 12:58:06 -06:00
Brenden Matthews
7268dd3cc6
Revert "autogen.sh needs README"
...
This reverts commit 1d37629bfb
2009-05-10 11:59:30 -06:00
Brenden Matthews
d224810235
Merge branch 'master' of git.omp.am:/home/omp/git/conky
2009-05-10 11:52:32 -06:00
Brenden Matthews
84c6daf8c9
Modified autogen.sh so we shouldn't need the README in the git repo.
2009-05-10 11:52:03 -06:00
Lassi Selander
1399b4483f
Fix for previous xmms2 patch.
2009-05-10 11:44:57 -06:00
Nikolas Garofil
c53813a49f
no gauges, bars, ... when compiled without X11
2009-05-10 14:14:21 +02:00
Nikolas Garofil
09ad5ce3f1
optimize previous commit (thanks Plague)
2009-05-10 13:44:13 +02:00
Nikolas Garofil
f7568b0753
strcpy shouldn't be used for overlapping strings
2009-05-10 13:14:54 +02:00
Nikolas Garofil
2afe66ed01
Bugfix: removing comments worked only partially
...
All lines behind a comment line were also removed, comments should also be able
to start in the middle of line, \# shouldn't be replaced if it's in a comment
2009-05-10 12:48:22 +02:00
Brenden Matthews
197c4d5bc3
Update docs, remove deprecated code.
2009-05-09 23:30:42 -06:00
Brenden Matthews
c105b54afa
Finish with check_docs.py.
...
This script checks consistency of docs, and automatically updates the
nano and vim syntax files.
2009-05-09 23:25:11 -06:00
Brenden Matthews
a5efc6fa46
Make docs aboot gap/position stuff easier to find.
2009-05-09 22:14:10 -06:00
Brenden Matthews
80aaadb48f
Merge branch 'master' into imlib2
2009-05-09 21:14:39 -06:00
Brenden Matthews
24f97c45c6
Allow the use of '#' for comments within text area (can be escaped with '\#'.
...
Also refactored some code relating to the config file loading (since
there was some duplication of code).
2009-05-09 20:10:55 -06:00
Brenden Matthews
9dc5411681
Fix backwards mail stuff.
2009-05-09 19:20:05 -06:00
Brenden Matthews
f49ab7ffcb
Only enable OpenMP stuff for gcc >=4.3.
2009-05-09 12:00:09 -06:00
Brenden Matthews
db06b5f953
Fix build errors.
2009-05-09 11:20:04 -06:00
Nikolas Garofil
10495ed282
Bugfix: vars related to graphics produced wrong output when not running in X
2009-05-09 14:06:58 +02:00
Brenden Matthews
a45c8c9da4
Add missing source files (genius here).
2009-05-08 14:42:34 -06:00
Brenden Matthews
f7c793a514
Merge branch 'master' into imlib2
2009-05-08 14:38:55 -06:00
Nikolas Garofil
9153318329
Only include disp when needed
2009-05-08 16:04:16 +02:00
Nikolas Garofil
bd99fe5d81
Bugfix: run update_uname also without X11
2009-05-08 14:57:19 +02:00
Brenden Matthews
fdadbbf98e
Added top_name_width config option.
2009-05-07 17:49:32 -06:00
Brenden Matthews
72a90b38be
Specify that imap/pop3 interval is in seconds.
2009-05-07 13:18:24 -06:00
Brenden Matthews
884ce9192e
Fix for imap docs.
2009-05-07 13:16:26 -06:00
Brenden Matthews
a1fc53be97
Merge branch 'master' into imlib2
2009-05-07 12:49:13 -06:00
Brenden Matthews
3b6f4c767a
Update changelog for last commit.
2009-05-07 12:48:54 -06:00
Nikolas Garofil
c1e47013ef
Bugfix: sometimes segfaults with cpubar
2009-05-07 18:44:45 +02:00
Brenden Matthews
31ed5ba178
Some work on imlib2 stuff.
2009-05-05 21:45:05 -06:00
Brenden Matthews
76dedfd563
Merge branch 'master' into imlib2
2009-05-05 17:44:12 -06:00
Brenden Matthews
af55c4afb1
Use a reduction here.
2009-05-05 17:43:45 -06:00
Brenden Matthews
8fbb3a9cfe
Merge branch 'master' into imlib2
2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435
Added some completely pointless OpenMP optimizations(?)
2009-05-05 17:36:12 -06:00
Nikolas Garofil
1d37629bfb
autogen.sh needs README
2009-05-05 18:46:46 +02:00
Brenden Matthews
d6e5a6491f
Merge branch 'master' into imlib2
2009-05-04 13:22:51 -06:00
Brenden Matthews
eb2b7a4f30
Removed bits about BSD license.
2009-05-04 13:20:42 -06:00
Brenden Matthews
1b24763df1
Add copyright/license stuff to sony.[ch].
2009-05-04 13:19:44 -06:00
Brenden Matthews
0d31ff0f4f
Missing files, fix last commit.
...
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9
2009-05-04 13:15:46 -06:00
Brenden Matthews
f6fe653401
Revert "Combine can now use other chars to seperate vars (used to be only space)"
...
This reverts commit 3dd1738fb9
2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9
Combine can now use other chars to seperate vars (used to be only space)
...
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c
Added Sony VAIO fanspeed info (thanks Yeon-Hyeong).
...
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
2009-05-03 21:23:59 -06:00
Brenden Matthews
a98a927116
Merge branch 'master' into imlib2
...
Conflicts:
configure.ac.in
src/conky.c
2009-05-01 23:29:21 -06:00
