1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-29 21:49:07 +00:00
Commit Graph

3166 Commits

Author SHA1 Message Date
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
Pavel Labath
8cb63b0c8b Update the default config file to match new syntax 2010-09-12 15:31:18 +02:00
Pavel Labath
c5e45008df Add a luaL_loadfile wrapper to lua::state 2010-09-12 14:53:06 +02:00
Pavel Labath
55282b64d8 Config file handling changes
- changed default config filenames, to avoid conflict with conky-1.x
- specifying "-" as config file reads from stdin
- if a user config file exists but is not readable, report an error instead of falling back to
  the system-wide config.
2010-09-12 14:01:34 +02:00
Pavel Labath
4426a8fa5b The --stdin-config param is kinda pointless, just use -c /dev/stdin 2010-09-12 13:50:47 +02:00
Pavel Labath
0a655c1ff6 Merge remote branch 'origin/master' into lua-config 2010-09-11 14:52:25 +02:00
Pavel Labath
eb06bb874c curl_global_init() is not needed here (anymore) 2010-09-11 14:51:08 +02:00
Pavel Labath
ef24f62412 Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/conky.cc
2010-09-11 14:50:37 +02:00
Pavel Labath
a111356ea4 Make music_player_interval a lua setting 2010-09-11 14:45:19 +02:00
Pavel Labath
47d9a63dff Make update_interval{,_on_battery} lua settings 2010-09-11 14:25:19 +02:00
Brenden Matthews
2f9195bd56 When we have a failure in mail thread, sleep for a bit. 2010-09-09 10:55:34 -07:00
Brenden Matthews
d0a20850c8 Improve failure handling in mail threads.
When we have a failure in the mail thread, lookup the hostname again in
case the failure is due odd to DNS changes, or some other madness.
2010-09-09 10:55:24 -07:00
Pavel Labath
cd5e3f8fa0 Make font and xftalpha lua settings 2010-09-08 17:30:04 +02:00
Pavel Labath
9fc5b84a32 Make pop3 and imap lua settings 2010-09-07 17:39:36 +02:00
Pavel Labath
2978965368 Make total_run_times a lua setting 2010-08-31 11:49:37 +02:00
Pavel Labath
5e6a5fdb3c htons() is not needed when using getaddrinfo (sf.net #3055612)
patch sumbitted by Ben Kibbey
2010-08-30 12:06:50 +02:00
Pavel Labath
ef2b39a97f Make text_buffer_size a lua setting 2010-08-29 23:50:32 +02:00
Pavel Labath
a9893684ac Make max_user_text a lua setting 2010-08-29 20:01:05 +02:00
Pavel Labath
6364bbd380 Make lua_{draw_hook_{pre,post},{shutdown,startup}_hook} lua settings 2010-08-29 15:56:15 +02:00
Pavel Labath
26cb39f67c Make lua_load a lua setting 2010-08-29 15:45:38 +02:00
Pavel Labath
b1891474e7 Make max_port_monitor_connections a lua setting 2010-08-29 15:19:46 +02:00
Pavel Labath
eedb5241f8 Make imlib_cache_{size,flush_interval} lua settings 2010-08-29 14:31:22 +02:00
Pavel Labath
77d4a55dcc Fix segfault in ccurl_thread.cc
curl_global_init() is not thread-safe, it must be called at the start of main()
2010-08-29 13:42:07 +02:00
Pavel Labath
ebd8a6d9fa Merge remote branch 'origin/master' into lua-config 2010-08-28 12:28:37 +02:00
Pavel Labath
0d9052b83b Add modelines to imlib.h 2010-08-28 12:26:12 +02:00
Pavel Labath
0ac1c21ece Avoid compiler warning 2010-08-27 16:24:26 +02:00
Pavel Labath
71e6a23729 Merge remote branch 'origin/master' into lua-config 2010-08-27 14:56:55 +02:00
Pavel Labath
b5f4c0f7e9 Update modelines on imlib.cc 2010-08-27 14:20:26 +02:00
Pavel Labath
68d0a223fb Make sensor_device a lua setting
I haven't tested if this compiles, but I couldn't have broken much, because before this it
definitely didn't compile.
2010-08-27 13:52:21 +02:00
Pavel Labath
ce49490144 Make mail_spool a lua setting 2010-08-26 23:07:21 +02:00
Pavel Labath
976e0eddf5 Merge remote branch 'origin/master' into lua-config
Conflicts:
	src/conky.cc
2010-08-26 22:38:55 +02:00
Pavel Labath
df6db63972 c++-ify variable_substitute() 2010-08-26 20:04:46 +02:00
Brenden Matthews
dee932d83b Fix crash in mail stuff due to bad free(). 2010-08-26 10:34:34 -07:00