Nikolas Garofil
8bdaeaa09a
Undo commit 8ea7b1
...
data/CMakeLists.txt makes sure that data/conky_no_x11.conf is only used for
builds without BUILD_X11 . out_to_x is not known in that case resulting in a
warning, out_to_console is already default here.
2010-11-18 16:31:32 +01:00
Pavel Labath
3db3e6045f
Fix segfault when out_to_x is set to false
2010-11-18 16:09:36 +01:00
Pavel Labath
8ea7b11ebd
Add out_to_x false to conky_no_x11.conf
...
this way, it will print to console even if conky was configured with X support
2010-11-18 16:08:24 +01:00
Nikolas Garofil
6ee9cbbce6
new config syntax for conky_no_x11.conf
2010-11-18 10:17:36 +01:00
Nikolas Garofil
e19f1c76a9
Some errormessages
2010-11-18 00:36:36 +01:00
Pavel Labath
aff8c66e7d
Converter: bool settings default to true, nicer quoting of short strings
2010-11-17 18:06:08 +01:00
Pavel Labath
87415d6e36
xftfont is renamed to font
...
whether the font setting specifies an X or an Xft font depends on the use_xft setting.
2010-11-17 14:49:03 +01:00
Pavel Labath
b7a80fa449
Fix segfault when own_window is set to false
2010-11-17 14:43:49 +01:00
Pavel Labath
8d37f8b498
Woops.. forgot to actually declare the nvidia_display setting
2010-11-17 14:36:48 +01:00
Pavel Labath
ecf932e7d1
convert.lua: a file attempting to convert conkyrc to the new syntax
2010-11-17 14:25:16 +01:00
Pavel Labath
ad79c87376
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
2010-11-16 22:55:33 +01:00
Nikolas Garofil
8123e447e2
Replace a CRIT_ERR in combine by trying,throwing and catching
...
PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 13:41:44 +01:00
Nikolas Garofil
fd9dd921a4
Extra constructor for own msg
2010-11-15 17:59:53 +01:00
Nikolas Garofil
5a41152dbb
Make stuff to throw childs of runtime_error
2010-11-15 17:52:42 +01:00
Nikolas Garofil
c671226a83
print_version() usable without quiting and replace all exit()-s in conky.cc
2010-11-15 17:07:38 +01:00
Pavel Labath
4ba0fe6c78
Merge remote branch 'origin/master' into lua-config
2010-11-15 14:35:02 +01:00
Nikolas Garofil
90eda7edbf
own_window and own_window_transparent should default to yes without option
2010-11-15 14:00:31 +01:00
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
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
