1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 11:05:18 +00:00
Commit Graph

1487 Commits

Author SHA1 Message Date
Nikolas Garofil
dae78fb875 Execbar can now also be used on the shell 2009-05-17 00:37:22 +02:00
Brenden Matthews
69718f5b75 Oh my, parse lua output. 2009-05-16 15:06:29 -06:00
Brenden Matthews
72d2aad026 Merge branch 'master' into lua 2009-05-16 14:55:24 -06:00
Brenden Matthews
0e21a804ee Couple minor lua changes. 2009-05-16 14:55:05 -06:00
Toni Spets
453908953f Moved the Lua function calling to it's own function 2009-05-16 20:57:43 +03:00
Toni Spets
da5704fd74 Specifically ask for an integer from Lua for percentage 2009-05-16 20:37:53 +03:00
Toni Spets
95f6748baa Updated AUTHORS to match Lua stuff, also updated my email 2009-05-16 20:32:47 +03:00
Nikolas Garofil
3762c5cb10 Use a builtin config without X11-support when compiled without it
also, make sure X isn't initialised when compiled without x11-support
2009-05-16 15:57:01 +02:00
Nikolas Garofil
2c35099b82 Bugfix: Segfault when starting with no configfile. 2009-05-16 13:14:45 +02:00
Toni Spets
66ba6e36c9 * Fix leaks
* Fix HUP behaviour - scripts are now reloaded on HUP
* Remove unneccessary calls to llua_close()
2009-05-15 23:35:18 +03:00
Toni Spets
b5934e5f69 Remove new lines from ERR messages 2009-05-15 23:01:08 +03:00
Brenden Matthews
08fbc21c19 Merge branch 'master' into lua 2009-05-15 13:51:43 -06:00
Toni Spets
0ea5fa1468 disable OpenMP by default, i386 optimization problems 2009-05-15 22:39:47 +03:00
Toni Spets
90c9ac2723 Fix old copyright year
Change all fprintf's to ERR()
2009-05-15 21:48:11 +03:00
Toni Spets
a64e9f8950 Lua scripting support, initial commit 2009-05-15 21:08:51 +03:00
Brenden Matthews
b4ca1d146f Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-13 12:29:09 -06:00
Brenden Matthews
9e79881b5f Fix remove_comments()? 2009-05-13 12:28:53 -06:00
Nikolas Garofil
4db2119a2b Bugfix: segfault with wrong config
Altough the following configuration is wrong, it should only produce a error
about a missing $endif but instead it also produced a segmentation fault:

TEXT
$if_gw$gw_ip$else
2009-05-13 20:25:14 +02:00
Brenden Matthews
1b94e22b5c Merge branch 'master' into imlib2 2009-05-12 18:07:20 -06:00
Brenden Matthews
4910d33524 Fix comment removal stuff so that it doesn't break $color. 2009-05-12 18:05:51 -06:00
Brenden Matthews
18b174e967 Merge branch 'master' into imlib2
Conflicts:
	src/Makefile.am
2009-05-12 17:52:49 -06:00
Phil Sutter
a2512e7c4f add interesting parts of my latest commits to the changelog 2009-05-12 22:50:43 +02:00
Nikolas Garofil
e0b2f75433 Don't check if_gw twice 2009-05-12 20:25:40 +02:00
Phil Sutter
a07a082d76 add documentation about --print-config 2009-05-12 01:58:41 +02:00
Phil Sutter
16d551b208 add system-wide config to FILES section 2009-05-12 01:31:47 +02:00
Phil Sutter
580043075e relying on the return value of scanf when using %n is bad 2009-05-12 00:49:40 +02:00
Phil Sutter
5d69d0378f fix human readable precision calculation
This bug was quite hard to trigger (happens only with values 9.995-9.999
and 99.95-99.99), but I made it. ;)
2009-05-12 00:49:40 +02:00
Phil Sutter
322d77942a hwmon: add args for value precalculation 2009-05-12 00:49:40 +02:00
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.

Conflicts:

	README.git-version
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