1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Commit Graph

2748 Commits

Author SHA1 Message Date
Nikolas Garofil
0d98fe8478 Merge branch 'master' into lua-config 2010-11-14 14:19:42 +01:00
Nikolas Garofil
a18f5e2808 Make sure MAINTAINER_MODE sets DEBUG 2010-11-14 02:27:01 +01:00
Nikolas Garofil
b5ff3eb411 Make lua required by cmake 2010-11-14 01:41:07 +01:00
Nikolas Garofil
4ac40e6054 Fix compiling without builtin config 2010-11-14 01:25:11 +01:00
Nikolas Garofil
e73da6b72e Fix compiling without X11 support 2010-11-13 23:59:31 +01:00
Pavel Labath
c9df66f487 Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/conky.cc
	src/logging.h
2010-11-13 20:17:46 +01:00
Pavel Labath
f33c65aed2 This was overkill 2010-11-13 20:11:29 +01:00
Pavel Labath
0852aa4fcd Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/ccurl_thread.cc
	src/conky.cc
	src/llua.cc
	src/logging.h
	src/nvidia.cc
2010-11-13 20:05:59 +01:00
Nikolas Garofil
9d7a914515 Make I18N optional 2010-11-13 19:45:04 +01:00
Pavel Labath
375e21af07 Fix a small leak + some cleanup 2010-11-13 19:40:43 +01:00
Pavel Labath
a1f4984a4e Make conky not crash on exit when using weather objects 2010-11-13 16:36:43 +01:00
Pavel Labath
758c2ed674 Use std::min instead of the MIN macro 2010-11-12 20:08:34 +01:00
Pavel Labath
d899f603d3 Fix some obvious errors in ccurl_thread.cc
However, the whole thing still doesn't quite work for me.... It crashes on exit.
2010-11-12 20:00:24 +01:00
Pavel Labath
9a08141389 Fix the "ISO C does not permit named variadic macros" in maintainer mode
and a few other that have cropped up in the process
2010-11-12 19:48:06 +01:00
Nikolas Garofil
561e1ea75d Fix missing SCNu16 (Thanks pavelo) 2010-11-12 18:21:58 +01:00
Nikolas Garofil
e918ea4655 Let cmake check whether to build for old or new audacious 2010-11-12 16:49:34 +01:00
Nikolas Garofil
4d157a298b Fix compiling with audacious support (Patch from billie, thanks !) 2010-11-12 12:32:49 +01:00
Nikolas Garofil
47965eedbc Fix memleak in is_disk() 2010-11-11 00:31:06 +01:00
Nikolas Garofil
1b90218c33 Let $acpitemp use /sys instead of /proc
From the 2.6.36 changelog (http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.36):
Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/ is already available and has been working for years w/o any problem.
The ACPI thermal procfs I/F will be removed in 2.6.37
2010-11-10 18:22:22 +01:00
Nikolas Garofil
b902b70e96 i18n-ize conky.cc 2010-10-31 20:01:20 +01:00
Pavel Labath
c9334eb071 Make conky (more-or-less) functional again 2010-10-31 18:17:22 +01:00
Pavel Labath
104ae7454c Make setting getters/setters atomic. 2010-10-31 00:22:35 +02:00
Nikolas Garofil
b98ebc90ee Internationalization support
This patch adds i18n-support with gettext, all translatable strings in the
code should be placed inside _() to make sure users see them in their own
language (I only did this for print_version() for now)
2010-10-31 00:02:02 +02:00
Pavel Labath
214ed0ac87 Add lock/unlock functions to lua::state 2010-10-30 23:54:13 +02:00
Nikolas Garofil
be9b62f0aa Show error when creating a empty udp package fails, this also fixes a g++ warning 2010-10-30 22:53:13 +02:00
Nikolas Garofil
33db46cef1 Fix building without Imlib2 2010-10-30 17:44:33 +02:00
Nikolas Garofil
89a8456495 Fix x11 check in cmake 2010-10-27 07:37:11 +02:00
Nikolas Garofil
11e5db2132 Fix memleak when there is no config available
The 'buf' string in current_config() got allocated but not deleted when
CRIT_ERR stops the program.
2010-10-24 17:57:58 +02:00
Kevin Lyles
56ddea77a8 Fixed foreground colors being semi-transparent
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-10-15 11:23:14 -07:00
Kevin Lyles
a251357f1d Fixed gradients to actually use both end colors
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-10-15 11:23:08 -07:00
Brenden Matthews
ca9acc13c0 C++ify some curl stuff. 2010-10-14 17:28:57 -07:00
Dan McGee
93c6baebb6 Enable use of HTTP cache headers in curl plugin
This will allow us to get 304 responses back from remote URLs that we are
grabbing using the curl, weather, and rss plugins. The first time we fetch a
resource, we will always get the full content, but from there on out we will
store any provided 'Etag' or 'Last-Modified' header, and submit these on the
next request. If we get a 304 response back, we won't have to do any work at
all.

This benefits both us (bandwidth and parsing savings) and remote URLs (we
actually make an attempt to not retrieve the same resource over and over
again).
2010-10-14 17:04:32 -07:00
Brenden Matthews
b06af986a8 Bulid fix for nvidia support.
See http://bugs.gentoo.org/show_bug.cgi?id=339971 for details.
2010-10-06 11:53:06 -07:00
Brenden Matthews
34fc51fdc0 Fix indentation. 2010-10-05 13:25:42 -07:00
Brenden Matthews
15006a1a41 Fix warning. 2010-10-05 13:22:27 -07:00
Brenden Matthews
d64b05b648 Build fix. 2010-10-05 13:21:36 -07:00
Brenden Matthews
6437804959 Allow method to pass execgraph arguments containing spaces. 2010-10-05 12:27:03 -07:00
Ben Kibbey
5a898d373e Abort curl transfers if they drop below 1000B/s for more than 60s.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-10-05 12:09:55 -07:00
Brenden Matthews
6119a0737e Correct docs. 2010-10-05 12:03:18 -07:00
Brenden Matthews
5b0dee741c Improve curl code. 2010-10-05 11:56:08 -07:00
Markus
c9cf08d9e9 Fix short_units for below kilo values.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2010-10-05 11:31:31 -07:00
Pavel Labath
1c785f2ab9 Remove obsolete config-file stuff, move slowly toward making conky functional again 2010-09-15 23:37:13 +02:00
Pavel Labath
9f7e696a85 Remove the $include variable
the way it is implemented now just wont work with the new config file. And i don't think that
many people used it anyway. Maybe add a replacement later?
2010-09-15 23:34:47 +02:00
Pavel Labath
d9d8506e0b Add a luaL_gsub wrapper to lua::state 2010-09-13 13:16:16 +02:00
Pavel Labath
22de36271d Build fix in smapi.cc 2010-09-13 11:49:44 +02:00
Pavel Labath
bad23c7b77 Remove the --for-scripts hack. Maybe add it later? 2010-09-12 16:43:43 +02:00
Pavel Labath
0fd23a6f7e Set CLOEXEC flag on the inotify file descriptor 2010-09-12 16:36:21 +02:00
Pavel Labath
eeb1a6a0d7 Properly load config file and print the default one
ps: the new implementation no longer requires fopencookie() and co.
2010-09-12 16:23:06 +02:00
Pavel Labath
e935a3d107 Call curl_global_cleanup() even in case of errors 2010-09-12 15:42:20 +02:00
Pavel Labath
bee7b9b99c Bugfix in own_window setting handler 2010-09-12 15:32:05 +02:00