Pavel Labath
97ac409903
Use real types instead of enums to distinguish exceptions
2010-11-15 00:24:49 +01:00
Nikolas Garofil
c2c06d0956
Fix memleak
2010-11-14 22:13:56 +01:00
Nikolas Garofil
5dd486d345
conky_error class replacing runtime_error
2010-11-14 18:19:46 +01:00
Nikolas Garofil
fbec1252a1
Merge branch 'master' into lua-config
2010-11-14 15:25:17 +01:00
Pavel Labath
17d4658242
Fix "Conky usually segfaults on config file changes" (sf.net #3100221 )
...
Someone needs to learn the difference between passing by value and passing by reference.
Bug reported by Kevin Lyles.
2010-11-14 14:34:39 +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
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
47965eedbc
Fix memleak in is_disk()
2010-11-11 00:31:06 +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
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
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
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
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
8cb63b0c8b
Update the default config file to match new syntax
2010-09-12 15:31:18 +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
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
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
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
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
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
