1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 13:00:45 +00:00
Commit Graph

2899 Commits

Author SHA1 Message Date
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
Pavel Labath
ed70663b99 Make minimum_{width,height} lua settings 2010-08-26 17:40:53 +02:00
Pavel Labath
467abd2edf Make default_gauge_{width,height} lua settings 2010-08-26 17:26:34 +02:00
Pavel Labath
184afe1555 Make default_graph_{width,height} lua settings 2010-08-26 17:18:55 +02:00
Pavel Labath
34a34693d7 Make default_bar_{width,height} lua settings 2010-08-26 16:33:13 +02:00
Pavel Labath
b6ed33b82a Make temperature_unit a lua setting 2010-08-25 21:26:14 +02:00
Pavel Labath
0085402d08 Make if_up_strictness a lua setting 2010-08-25 19:40:24 +02:00
Pavel Labath
127ed29fb9 Make stippled_borders a lua setting 2010-08-25 19:26:15 +02:00
Pavel Labath
e59679a0c1 Make pad_percents a lua setting 2010-08-25 19:19:10 +02:00
Pavel Labath
b863f216b8 Make hddtemp_{host,port} lua settings 2010-08-25 19:16:56 +02:00
Pavel Labath
31cbd710a6 Make top_name_width a lua setting 2010-08-25 19:09:15 +02:00
Pavel Labath
3d29d27e8b make maximum_width a lua setting 2010-08-25 19:01:02 +02:00
Pavel Labath
5f60b5427e Improve range_config_setting<>
now it catches negative values assigned to unsigned settings
2010-08-25 18:51:29 +02:00
Pavel Labath
af4633a8ee fix compilation errors in previous commit 2010-08-24 22:27:09 +02:00
Pavel Labath
684933416c Fix segfault in i8k (sf.net #3007167)
Apparently, sometimes the value of i8k.right_fan_status is sometimes null. This just makes sure
the null value isn't passed to atoi(3). A better solution would be to figure out why is it null,
but I cannot do that as I don't have the hardware.
2010-08-24 21:50:07 +02:00
Pavel Labath
2c96799e59 Make {overwrite,append}_file lua settings 2010-08-22 13:04:19 +02:00
Pavel Labath
3dd4593bc9 Make max_text_width a lua setting 2010-08-22 12:49:31 +02:00
Pavel Labath
228f65bc52 Make diskio_avg_samples a lua setting 2010-08-22 12:31:11 +02:00