Brenden Matthews [Mon, 18 May 2009 04:11:40 +0000 (22:11 -0600)]
Merge branch 'master' into imlib2
Conflicts:
extras/nano/conky.nanorc
extras/vim/syntax/conkyrc.vim
Brenden Matthews [Mon, 18 May 2009 04:03:37 +0000 (22:03 -0600)]
Added support for the Lua programming language.
Changelog update.
Brenden Matthews [Mon, 18 May 2009 04:00:44 +0000 (22:00 -0600)]
Merge branch 'lua'
Conflicts:
src/specials.c
Brenden Matthews [Mon, 18 May 2009 03:59:05 +0000 (21:59 -0600)]
Fix null pointer boog in $top stuff.
Brenden Matthews [Mon, 18 May 2009 02:58:13 +0000 (20:58 -0600)]
Merge branch 'master' into lua
Nikolas Garofil [Sun, 17 May 2009 11:38:51 +0000 (13:38 +0200)]
execbar can now be used in the shell even when compiled with x11 support
Brenden Matthews [Sun, 17 May 2009 05:47:02 +0000 (23:47 -0600)]
More work on imlib2 stuff.
Seems to be some rendering corruption which I'm not sure the reason for,
but other than that I think it works okay.
Brenden Matthews [Sun, 17 May 2009 04:24:45 +0000 (22:24 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Sun, 17 May 2009 04:24:22 +0000 (22:24 -0600)]
Oops, remove debug printf().
Brenden Matthews [Sun, 17 May 2009 00:37:11 +0000 (18:37 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Sun, 17 May 2009 00:37:04 +0000 (18:37 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sun, 17 May 2009 00:28:19 +0000 (18:28 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 17 May 2009 00:28:04 +0000 (18:28 -0600)]
Fixed comment stuff for real this time?
Nikolas Garofil [Sat, 16 May 2009 23:33:43 +0000 (01:33 +0200)]
add missing var
Brenden Matthews [Sat, 16 May 2009 23:19:15 +0000 (17:19 -0600)]
Fix docs.
Brenden Matthews [Sat, 16 May 2009 23:08:50 +0000 (17:08 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sat, 16 May 2009 23:08:37 +0000 (17:08 -0600)]
Remove unused var.
Brenden Matthews [Sat, 16 May 2009 23:05:30 +0000 (17:05 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua
Conflicts:
src/specials.c
Brenden Matthews [Sat, 16 May 2009 23:04:26 +0000 (17:04 -0600)]
More lua stuff.
Nikolas Garofil [Sat, 16 May 2009 22:37:22 +0000 (00:37 +0200)]
Execbar can now also be used on the shell
Brenden Matthews [Sat, 16 May 2009 21:06:29 +0000 (15:06 -0600)]
Oh my, parse lua output.
Brenden Matthews [Sat, 16 May 2009 20:55:24 +0000 (14:55 -0600)]
Merge branch 'master' into lua
Brenden Matthews [Sat, 16 May 2009 20:55:05 +0000 (14:55 -0600)]
Couple minor lua changes.
Toni Spets [Sat, 16 May 2009 17:57:43 +0000 (20:57 +0300)]
Moved the Lua function calling to it's own function
Toni Spets [Sat, 16 May 2009 17:37:53 +0000 (20:37 +0300)]
Specifically ask for an integer from Lua for percentage
Toni Spets [Sat, 16 May 2009 17:32:47 +0000 (20:32 +0300)]
Updated AUTHORS to match Lua stuff, also updated my email
Nikolas Garofil [Sat, 16 May 2009 13:57:01 +0000 (15:57 +0200)]
Use a builtin config without X11-support when compiled without it
also, make sure X isn't initialised when compiled without x11-support
Nikolas Garofil [Sat, 16 May 2009 11:14:45 +0000 (13:14 +0200)]
Bugfix: Segfault when starting with no configfile.
Toni Spets [Fri, 15 May 2009 20:35:18 +0000 (23:35 +0300)]
* Fix leaks
* Fix HUP behaviour - scripts are now reloaded on HUP
* Remove unneccessary calls to llua_close()
Toni Spets [Fri, 15 May 2009 20:01:08 +0000 (23:01 +0300)]
Remove new lines from ERR messages
Brenden Matthews [Fri, 15 May 2009 19:51:43 +0000 (13:51 -0600)]
Merge branch 'master' into lua
Toni Spets [Fri, 15 May 2009 19:39:47 +0000 (22:39 +0300)]
disable OpenMP by default, i386 optimization problems
Toni Spets [Fri, 15 May 2009 18:48:11 +0000 (21:48 +0300)]
Fix old copyright year
Change all fprintf's to ERR()
Toni Spets [Fri, 15 May 2009 18:08:51 +0000 (21:08 +0300)]
Lua scripting support, initial commit
Brenden Matthews [Wed, 13 May 2009 18:29:09 +0000 (12:29 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Wed, 13 May 2009 18:28:53 +0000 (12:28 -0600)]
Fix remove_comments()?
Nikolas Garofil [Wed, 13 May 2009 18:25:14 +0000 (20:25 +0200)]
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
Brenden Matthews [Wed, 13 May 2009 00:07:20 +0000 (18:07 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Wed, 13 May 2009 00:05:51 +0000 (18:05 -0600)]
Fix comment removal stuff so that it doesn't break $color.
Brenden Matthews [Tue, 12 May 2009 23:52:49 +0000 (17:52 -0600)]
Merge branch 'master' into imlib2
Conflicts:
src/Makefile.am
Phil Sutter [Tue, 12 May 2009 20:50:43 +0000 (22:50 +0200)]
add interesting parts of my latest commits to the changelog
Nikolas Garofil [Tue, 12 May 2009 18:25:40 +0000 (20:25 +0200)]
Don't check if_gw twice
Phil Sutter [Mon, 11 May 2009 23:58:41 +0000 (01:58 +0200)]
add documentation about --print-config
Phil Sutter [Mon, 11 May 2009 23:31:47 +0000 (01:31 +0200)]
add system-wide config to FILES section
Phil Sutter [Sun, 10 May 2009 23:25:25 +0000 (01:25 +0200)]
relying on the return value of scanf when using %n is bad
Phil Sutter [Sun, 10 May 2009 22:52:15 +0000 (00:52 +0200)]
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. ;)
Phil Sutter [Sun, 10 May 2009 22:22:02 +0000 (00:22 +0200)]
hwmon: add args for value precalculation
Phil Sutter [Sun, 10 May 2009 20:47:47 +0000 (22:47 +0200)]
fix hwmon for 2.6.29, simplify code a bit
Nikolas Garofil [Mon, 11 May 2009 17:47:24 +0000 (19:47 +0200)]
Bugfix: if_gw only outputs if another gw var is in the if block (sf id 2784627)
Nikolas Garofil [Mon, 11 May 2009 16:37:12 +0000 (18:37 +0200)]
Remove even more x11-stuff with --disable-x11
Brenden Matthews [Sun, 10 May 2009 19:41:37 +0000 (13:41 -0600)]
Ammend AUTHORS.
Jaromir Smrcek [Sun, 10 May 2009 19:37:04 +0000 (13:37 -0600)]
APC UPS fixes.
Brenden Matthews [Sun, 10 May 2009 19:24:31 +0000 (13:24 -0600)]
Add note to git readme about doc generation.
Nikolas Garofil [Sun, 10 May 2009 19:18:20 +0000 (21:18 +0200)]
no x11-stuff for apcupsd when disabled
Brenden Matthews [Sun, 10 May 2009 19:11:09 +0000 (13:11 -0600)]
Various fixes.
Added missing apcupsd.[hc], added apcupsd_loadgauge, fixed compilation
errors, updated docs & syntax stuff.
Jaromir Smrcek [Sun, 10 May 2009 18:58:06 +0000 (12:58 -0600)]
Added support for APC UPS daemon monitoring.
Brenden Matthews [Sun, 10 May 2009 17:59:30 +0000 (11:59 -0600)]
Revert "autogen.sh needs README"
This reverts commit
1d37629bfbc506eb32415b4bbbbd7d639e7b0276.
Conflicts:
README.git-version
Brenden Matthews [Sun, 10 May 2009 17:52:32 +0000 (11:52 -0600)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Brenden Matthews [Sun, 10 May 2009 17:52:03 +0000 (11:52 -0600)]
Modified autogen.sh so we shouldn't need the README in the git repo.
Lassi Selander [Sun, 10 May 2009 17:44:57 +0000 (11:44 -0600)]
Fix for previous xmms2 patch.
Nikolas Garofil [Sun, 10 May 2009 12:14:21 +0000 (14:14 +0200)]
no gauges, bars, ... when compiled without X11
Nikolas Garofil [Sun, 10 May 2009 11:44:13 +0000 (13:44 +0200)]
optimize previous commit (thanks Plague)
Nikolas Garofil [Sun, 10 May 2009 11:14:54 +0000 (13:14 +0200)]
strcpy shouldn't be used for overlapping strings
Nikolas Garofil [Sun, 10 May 2009 10:48:22 +0000 (12:48 +0200)]
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
Brenden Matthews [Sun, 10 May 2009 05:30:42 +0000 (23:30 -0600)]
Update docs, remove deprecated code.
Brenden Matthews [Sun, 10 May 2009 05:25:11 +0000 (23:25 -0600)]
Finish with check_docs.py.
This script checks consistency of docs, and automatically updates the
nano and vim syntax files.
Brenden Matthews [Sun, 10 May 2009 04:14:10 +0000 (22:14 -0600)]
Make docs aboot gap/position stuff easier to find.
Brenden Matthews [Sun, 10 May 2009 03:14:39 +0000 (21:14 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Sun, 10 May 2009 02:10:55 +0000 (20:10 -0600)]
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).
Brenden Matthews [Sun, 10 May 2009 01:20:05 +0000 (19:20 -0600)]
Fix backwards mail stuff.
Brenden Matthews [Sat, 9 May 2009 18:00:09 +0000 (12:00 -0600)]
Only enable OpenMP stuff for gcc >=4.3.
Brenden Matthews [Sat, 9 May 2009 17:20:04 +0000 (11:20 -0600)]
Fix build errors.
Nikolas Garofil [Sat, 9 May 2009 12:06:58 +0000 (14:06 +0200)]
Bugfix: vars related to graphics produced wrong output when not running in X
Brenden Matthews [Fri, 8 May 2009 20:42:34 +0000 (14:42 -0600)]
Add missing source files (genius here).
Brenden Matthews [Fri, 8 May 2009 20:38:55 +0000 (14:38 -0600)]
Merge branch 'master' into imlib2
Nikolas Garofil [Fri, 8 May 2009 14:04:16 +0000 (16:04 +0200)]
Only include disp when needed
Nikolas Garofil [Fri, 8 May 2009 12:57:19 +0000 (14:57 +0200)]
Bugfix: run update_uname also without X11
Brenden Matthews [Thu, 7 May 2009 23:49:32 +0000 (17:49 -0600)]
Added top_name_width config option.
Brenden Matthews [Thu, 7 May 2009 19:18:24 +0000 (13:18 -0600)]
Specify that imap/pop3 interval is in seconds.
Brenden Matthews [Thu, 7 May 2009 19:16:26 +0000 (13:16 -0600)]
Fix for imap docs.
Brenden Matthews [Thu, 7 May 2009 18:49:13 +0000 (12:49 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Thu, 7 May 2009 18:48:54 +0000 (12:48 -0600)]
Update changelog for last commit.
Nikolas Garofil [Thu, 7 May 2009 16:44:45 +0000 (18:44 +0200)]
Bugfix: sometimes segfaults with cpubar
Brenden Matthews [Wed, 6 May 2009 03:45:05 +0000 (21:45 -0600)]
Some work on imlib2 stuff.
Brenden Matthews [Tue, 5 May 2009 23:44:12 +0000 (17:44 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Tue, 5 May 2009 23:43:45 +0000 (17:43 -0600)]
Use a reduction here.
Brenden Matthews [Tue, 5 May 2009 23:36:38 +0000 (17:36 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Tue, 5 May 2009 23:36:12 +0000 (17:36 -0600)]
Added some completely pointless OpenMP optimizations(?)
Nikolas Garofil [Tue, 5 May 2009 16:46:46 +0000 (18:46 +0200)]
autogen.sh needs README
Brenden Matthews [Mon, 4 May 2009 19:22:51 +0000 (13:22 -0600)]
Merge branch 'master' into imlib2
Brenden Matthews [Mon, 4 May 2009 19:20:42 +0000 (13:20 -0600)]
Removed bits about BSD license.
Brenden Matthews [Mon, 4 May 2009 19:19:44 +0000 (13:19 -0600)]
Add copyright/license stuff to sony.[ch].
Brenden Matthews [Mon, 4 May 2009 19:15:46 +0000 (13:15 -0600)]
Missing files, fix last commit.
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9e16831166e70201078164d551c7ffc
Brenden Matthews [Mon, 4 May 2009 19:13:51 +0000 (13:13 -0600)]
Revert "Combine can now use other chars to seperate vars (used to be only space)"
This reverts commit
3dd1738fb9e16831166e70201078164d551c7ffc.
Nikolas Garofil [Mon, 4 May 2009 10:58:52 +0000 (12:58 +0200)]
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.
Yeon-Hyeong Yang [Mon, 4 May 2009 03:23:59 +0000 (21:23 -0600)]
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.
Brenden Matthews [Sat, 2 May 2009 05:29:21 +0000 (23:29 -0600)]
Merge branch 'master' into imlib2
Conflicts:
configure.ac.in
src/conky.c
Brenden Matthews [Sat, 2 May 2009 05:05:06 +0000 (23:05 -0600)]
Fixed $texeci regression.
Brenden Matthews [Fri, 1 May 2009 23:12:09 +0000 (17:12 -0600)]
Fix changelog.
Needed to make sure the stuff that went in after 1.7.0 is not below the
'1.7.0 released' entry.
Yeon-Hyeong Yang [Fri, 1 May 2009 23:03:59 +0000 (17:03 -0600)]
Added diskio_avg_samples patch (thanks Yeon-Hyeong)