Pavel Labath
00e91d8c31
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
src/x11.cc
2010-04-22 21:17:14 +02:00
Nikolas Garofil
89c2d4ecdd
curl
2010-04-19 14:54:03 +02:00
Nikolas Garofil
d6537aa678
Add support for $stock
2010-04-19 14:45:05 +02:00
Nikolas Garofil
0ab2efc2b2
Add support for $no_update
2010-04-17 15:19:44 +02:00
Nikolas Garofil
f5c147b160
Add support for $nodename_short
...
This is different implementation (compared to 9e3156a4a6
2010-04-14 18:41:25 +02:00
Pavel Labath
aa95dfdd5e
make top_cpu_separate a lua setting
2010-03-07 13:33:48 +01:00
Pavel Labath
357a505dc4
make no_buffers a lua setting
2010-03-07 13:20:16 +01:00
Pavel Labath
48346c8325
make times_in_seconds a lua setting
2010-03-05 14:20:04 +01:00
Pavel Labath
af02eab4b6
This appears to plug a leak.
2010-03-04 17:40:37 +01:00
Pavel Labath
d93dc72e6d
Random C++ification: to_real_path() and current_config
2010-03-04 17:40:20 +01:00
Nikolas Garofil
e7ed9a5060
Revert "Use "using namespace std;" and remove all std::'s"
...
This reverts commit 41e80b9833
2010-02-24 20:10:26 +01:00
Nikolas Garofil
41e80b9833
Use "using namespace std;" and remove all std::'s
...
I'm doing this because otherwise i'll will forget to add all those
std::'s and will lose a LOT of time finding the problems.
If you don't agree, undo this patch...
...but i hope you won't :)
2010-02-24 19:39:45 +01:00
Nikolas Garofil
c51972b5e2
Use free_and_zero in ccurl_common.cc where appropriate
2010-02-23 15:48:18 +01:00
Caleb Spare
c7fa36a5f2
$memwithbuffers object and bar (sf.net #2954143 )
...
I've added $memwithbuffers to complement $mem, $memeasyfree, etc. This
variable indicates the used system memory, regardless of buffers/caches. If
the "no_buffers" option is set to "no", it will be the same as $mem. The
reason I find this change useful is that I like to display both the total
used system memory and the memory being used by applications.
I've also included a memwithbuffersbar, which is the same as membar except
that it uses $memwithbuffers as the size instead of $mem.
Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-02-18 18:32:25 +01:00
Pavel Labath
1de2a9e6c5
Add optional argument to $acpiacadapter
...
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
2010-01-24 15:34:03 +01:00
Phil Sutter
bdda06f4ea
fix segfaults in CRIT_ERR condition
...
- pthread_join() on uninitialised threads causes segfault
- XFreeFont() dislikes font being zero
2010-01-10 22:09:33 +01:00
Brenden Matthews
7e78f036f0
Use consistent naming for build option macros.
...
Probably have broken some build features with this commit.
2010-01-06 18:39:44 -08:00
Brenden Matthews
9b46a61ae6
Don't include non-existent files.
2010-01-06 11:33:42 -08:00
Cesare Tirabassi
2568030509
Fix sigsegv if cpu_usage has not yet been populated (seen on 1.8.0_rc1)
2010-01-05 16:59:50 +01:00
Brenden Matthews
7ff762e4af
Resolve issues with timed_thread rewrite WIP.
2010-01-04 19:21:12 -08:00
Brenden Matthews
620e9876a4
C++ conversions WIP.
...
Currently stuck on an issue with g++ and using '%lli' with printf/scanf.
2010-01-04 19:21:12 -08:00
