Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-16 01:57:09 +00:00
Code Issues Releases Activity
2,821 Commits 5 Branches 46 Tags 22 MiB
f0d48190ff
Commit Graph

2821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Labath
f0d48190ff $mixer: report more reasonable values for mono devices 2011-01-01 11:37:31 +01:00
Tiago Vale
c5d065d119 Added support for POWER_SUPPLY_POWER_NOW In Linux, apparently POWER_SUPPLY_CURRENT_NOW was deprecated and replaced by POWER_SUPPLY_POWER_NOW. In my system, ever since kernel 2.6.36.1 battery lifetime showed "unknown" in conky. Check http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532000. 
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-12-30 14:42:16 +01:00
Pavel Labath
29ef75083a Fix 'comparison between signed and unsigned expressions' warning 2010-12-23 18:25:31 +01:00
Pavel Labath
67b11f84ec install conky documentation with a configurable path (-DDOC_PATH) (sf.net #3117859) 
patch contributed by Daniel Pielmeier (billie)
 2010-12-11 13:50:59 +01:00
Pavel Labath
44a30fac3d kvm_proc needs synchronized access 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>

Conflicts:

	src/conky.c
	src/freebsd.cc
	src/freebsd.h
 2010-12-09 19:22:34 +01:00
Pavel Labath
187dc352c4 apcupsd supposedly works on FreeBSD as well 2010-12-09 18:55:22 +01:00
Nikos Ntarmos
3b5d5f33b3 Build fixes for bmpx 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
 2010-12-09 18:46:51 +01:00
Pavel Labath
f1bc24f199 fclose(3) instead of pclose(3) as the latter seems to leak file descriptors 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>

Conflicts:

	src/exec.c - had to merge manually
 2010-12-05 21:16:01 +01:00
Pavel Labath
43d81169f6 Use initializer list for member initialization 2010-11-26 18:03:41 +01:00
Nikolas Garofil
99c359b212 Fix displaying UTF-8 without XFT 2010-11-26 17:59:07 +01:00
Nikolas Garofil
7310bff162 remove TEXT in config_settings.xml and variables.xml 2010-11-25 14:41:24 +01:00
Pavel Labath
25c1b1d919 convert.lua: if the string countains a backslash, don't quote with '' 2010-11-25 13:49:56 +01:00
Nikolas Garofil
f6a4588b3c Include default values set by cmake in print_version(), Don't set HTTPPORT when BUILD_HTTP is unset 2010-11-24 18:17:53 +01:00
Nikolas Garofil
d48e83e0d4 Bugfix: Shades weren't placed correct after a $goto 2010-11-24 16:47:29 +01:00
Nikolas Garofil
b43e130180 small rewrite print_version() 2010-11-24 00:46:29 +01:00
Pavel Labath
981ed0b609 fix own_window_colour setting name 2010-11-23 23:18:50 +01:00
Pavel Labath
6374a487cc Merge branch 'master' of git.omp.am:/home/omp/git/conky 2010-11-23 19:29:25 +01:00
Pavel Labath
7df57a9961 Change the default config file back to .conkyrc 
we have the auto-conversion script now, there is no need for a new name (yet)
 2010-11-23 19:18:47 +01:00
Pavel Labath
acbd44856f install the conversion script with make install 2010-11-23 19:17:42 +01:00
Nikolas Garofil
7b128a9f16 Merge branch 'lua-config' 2010-11-23 18:56:58 +01:00
Nikolas Garofil
c93f9817cb Merge branch 'master' into lua-config 2010-11-23 18:50:48 +01:00
Nikolas Garofil
687407479f Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC 2010-11-23 18:50:40 +01:00
Pavel Labath
5aa59f55fa Make xmms2 work again (not tested yet) 2010-11-23 18:42:48 +01:00
Nikolas Garofil
1b791ed1c8 Merge branch 'master' into lua-config 2010-11-23 17:42:00 +01:00
Nikolas Garofil
23a193fe89 Complete previous commit 2010-11-23 17:40:53 +01:00
Nikolas Garofil
c1933dc186 Make sure char-arrays filled with read() are null-terminated 2010-11-23 17:33:26 +01:00
Pavel Labath
c9e855060d Merge remote branch 'origin/master' into lua-config 
Conflicts:
	cmake/ConkyBuildOptions.cmake
	src/conky.cc
 2010-11-23 16:49:18 +01:00
Pavel Labath
cc98b26119 Fix small error in old config handling 2010-11-23 16:45:42 +01:00
Pavel Labath
4ab7f6d0d1 Replace the if(&l) unused hack with unused attribute 2010-11-23 16:43:14 +01:00
Nikolas Garofil
5781e4f1e7 Fix build with BUILD_X11 but without OWN_WINDOW 2010-11-23 13:58:53 +01:00
Nikolas Garofil
529392aef0 Fix building without BUILD_OLD_CONFIG 2010-11-22 23:45:38 +01:00
Nikolas Garofil
5f76f847dd Bugfix: choosing BUILD_ARGB without OWN_WINDOW breaks building 2010-11-22 21:14:45 +01:00
Nikolas Garofil
a8d633009d Bugfix: choosing BUILD_ARGB without OWN_WINDOW breaks building 2010-11-22 21:00:26 +01:00
Nikolas Garofil
773b53b94d Make sure 'continuing from mem'-msg is also visible when removing old syntax configurations 2010-11-22 15:45:29 +01:00
Nikolas Garofil
0d956d8d8b Use files instead of STDIN and STDOUT for convert.lua 2010-11-22 14:21:53 +01:00
Nikolas Garofil
c119410c78 A bit i18n 2010-11-21 23:39:35 +01:00
Pavel Labath
5a7ec7fb0b Simplify exception handling and get rid of conky::critical_error 
As i said in my rant somewhere, it's up to the person catching the exception to decide if the
error is critical or not. The person throwing the exception should specify the type of error and
that's where his job ends.
 2010-11-21 22:44:04 +01:00
Pavel Labath
5c49c52a0b make convert.lua "bimodal" 
it does The Right Thing(tm) both when called from conky and as standalone
 2010-11-21 22:26:35 +01:00
Nikolas Garofil
b5216499c2 Don't quit when configfiles are deleted 2010-11-21 16:56:50 +01:00
Nikolas Garofil
5a85fc9053 Don't quit when configfiles are deleted 2010-11-21 16:46:58 +01:00
Nikolas Garofil
b0e1c3d8a5 Remove useless try-catch 2010-11-21 15:46:42 +01:00
Nikolas Garofil
bce7064cdb Bugfix: segfault at config reload 2010-11-21 14:32:59 +01:00
Nikolas Garofil
a87c3ee205 Shrink code 2010-11-21 00:23:27 +01:00
Nikolas Garofil
199f8876fb Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available) 2010-11-21 00:05:20 +01:00
Nikolas Garofil
cad18ce2e0 Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available) 2010-11-20 23:35:02 +01:00
Nikolas Garofil
c63f42a693 fix manual merge 2010-11-20 17:25:06 +01:00
Nikolas Garofil
fcf318c6dd Fix bug with SF ID 3101185 (manual merge) 2010-11-20 17:18:34 +01:00
Nikolas Garofil
0ee557a4ee Fix bug with SF ID 3101185 2010-11-20 16:59:32 +01:00
Nikolas Garofil
559d4ebb53 clean up code a bit 2010-11-19 15:52:21 +01:00
Nikolas Garofil
63e493d3bb Bugfix: Builtin configs didn't support old syntax 2010-11-19 15:46:05 +01:00