Pavel Labath
981ed0b609
fix own_window_colour setting name
2010-11-23 23:18:50 +01:00
Nikolas Garofil
7b128a9f16
Merge branch 'lua-config'
2010-11-23 18:56:58 +01:00
Nikolas Garofil
c93f9817cb
Merge branch 'master' into lua-config
2010-11-23 18:50:48 +01:00
Nikolas Garofil
687407479f
Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC
2010-11-23 18:50:40 +01:00
Pavel Labath
5aa59f55fa
Make xmms2 work again (not tested yet)
2010-11-23 18:42:48 +01:00
Nikolas Garofil
1b791ed1c8
Merge branch 'master' into lua-config
2010-11-23 17:42:00 +01:00
Nikolas Garofil
23a193fe89
Complete previous commit
2010-11-23 17:40:53 +01:00
Nikolas Garofil
c1933dc186
Make sure char-arrays filled with read() are null-terminated
2010-11-23 17:33:26 +01:00
Pavel Labath
cc98b26119
Fix small error in old config handling
2010-11-23 16:45:42 +01:00
Pavel Labath
4ab7f6d0d1
Replace the if(&l) unused hack with unused attribute
2010-11-23 16:43:14 +01:00
Nikolas Garofil
5781e4f1e7
Fix build with BUILD_X11 but without OWN_WINDOW
2010-11-23 13:58:53 +01:00
Nikolas Garofil
529392aef0
Fix building without BUILD_OLD_CONFIG
2010-11-22 23:45:38 +01:00
Nikolas Garofil
c119410c78
A bit i18n
2010-11-21 23:39:35 +01:00
Pavel Labath
5a7ec7fb0b
Simplify exception handling and get rid of conky::critical_error
...
As i said in my rant somewhere, it's up to the person catching the exception to decide if the
error is critical or not. The person throwing the exception should specify the type of error and
that's where his job ends.
2010-11-21 22:44:04 +01:00
Pavel Labath
5c49c52a0b
make convert.lua "bimodal"
...
it does The Right Thing(tm) both when called from conky and as standalone
2010-11-21 22:26:35 +01:00
Nikolas Garofil
b5216499c2
Don't quit when configfiles are deleted
2010-11-21 16:56:50 +01:00
Nikolas Garofil
5a85fc9053
Don't quit when configfiles are deleted
2010-11-21 16:46:58 +01:00
Nikolas Garofil
b0e1c3d8a5
Remove useless try-catch
2010-11-21 15:46:42 +01:00
Nikolas Garofil
bce7064cdb
Bugfix: segfault at config reload
2010-11-21 14:32:59 +01:00
Nikolas Garofil
a87c3ee205
Shrink code
2010-11-21 00:23:27 +01:00
Nikolas Garofil
199f8876fb
Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available)
2010-11-21 00:05:20 +01:00
Nikolas Garofil
cad18ce2e0
Fix leaks that happen when there is no config available (these are only tiny leaks because conky will shutdown anyway when there is no config available)
2010-11-20 23:35:02 +01:00
Nikolas Garofil
c63f42a693
fix manual merge
2010-11-20 17:25:06 +01:00
Nikolas Garofil
fcf318c6dd
Fix bug with SF ID 3101185 (manual merge)
2010-11-20 17:18:34 +01:00
Nikolas Garofil
0ee557a4ee
Fix bug with SF ID 3101185
2010-11-20 16:59:32 +01:00
Nikolas Garofil
559d4ebb53
clean up code a bit
2010-11-19 15:52:21 +01:00
Nikolas Garofil
5d28bed7db
Support for old config syntax (Optional)
2010-11-19 14:27:18 +01:00
Pavel Labath
3db3e6045f
Fix segfault when out_to_x is set to false
2010-11-18 16:09:36 +01:00
Nikolas Garofil
e19f1c76a9
Some errormessages
2010-11-18 00:36:36 +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
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
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
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
