Brenden Matthews
a1fc53be97
Merge branch 'master' into imlib2
2009-05-07 12:49:13 -06:00
Brenden Matthews
3b6f4c767a
Update changelog for last commit.
2009-05-07 12:48:54 -06:00
Nikolas Garofil
c1e47013ef
Bugfix: sometimes segfaults with cpubar
2009-05-07 18:44:45 +02:00
Brenden Matthews
31ed5ba178
Some work on imlib2 stuff.
2009-05-05 21:45:05 -06:00
Brenden Matthews
76dedfd563
Merge branch 'master' into imlib2
2009-05-05 17:44:12 -06:00
Brenden Matthews
af55c4afb1
Use a reduction here.
2009-05-05 17:43:45 -06:00
Brenden Matthews
8fbb3a9cfe
Merge branch 'master' into imlib2
2009-05-05 17:36:38 -06:00
Brenden Matthews
fde096c435
Added some completely pointless OpenMP optimizations(?)
2009-05-05 17:36:12 -06:00
Nikolas Garofil
1d37629bfb
autogen.sh needs README
2009-05-05 18:46:46 +02:00
Brenden Matthews
d6e5a6491f
Merge branch 'master' into imlib2
2009-05-04 13:22:51 -06:00
Brenden Matthews
eb2b7a4f30
Removed bits about BSD license.
2009-05-04 13:20:42 -06:00
Brenden Matthews
1b24763df1
Add copyright/license stuff to sony.[ch].
2009-05-04 13:19:44 -06:00
Brenden Matthews
0d31ff0f4f
Missing files, fix last commit.
...
Added sony.[ch] stuff, as well as the important change from commit
3dd1738fb9
2009-05-04 13:15:46 -06:00
Brenden Matthews
f6fe653401
Revert "Combine can now use other chars to seperate vars (used to be only space)"
...
This reverts commit 3dd1738fb9
2009-05-04 13:13:51 -06:00
Nikolas Garofil
3dd1738fb9
Combine can now use other chars to seperate vars (used to be only space)
...
Also undid the last change because sony.h was not included, feel free to submit
it again if you include this file and other sourcefiles needed (there is also
no definition of get_sony_fanspeed). If sony systems already have this file and
a definition of this function, please update the configure file so that support
for this is disabled by default and can be enabled by sony owners.
2009-05-04 12:58:52 +02:00
Yeon-Hyeong Yang
f8a6a4035c
Added Sony VAIO fanspeed info (thanks Yeon-Hyeong).
...
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
2009-05-03 21:23:59 -06:00
Brenden Matthews
a98a927116
Merge branch 'master' into imlib2
...
Conflicts:
configure.ac.in
src/conky.c
2009-05-01 23:29:21 -06:00
Brenden Matthews
27fff0d9cb
Fixed $texeci regression.
2009-05-01 23:05:06 -06:00
Brenden Matthews
45b3a6f66d
Fix changelog.
...
Needed to make sure the stuff that went in after 1.7.0 is not below the
'1.7.0 released' entry.
2009-05-01 17:12:09 -06:00
Yeon-Hyeong Yang
68ea7a7859
Added diskio_avg_samples patch (thanks Yeon-Hyeong)
2009-05-01 17:03:59 -06:00
Brenden Matthews
814469b0c9
Conky 1.7.0 "Hungry Hobo" released!
2009-05-01 16:56:12 -06:00
Brenden Matthews
cd2fc39cad
Bump docs.
2009-05-01 16:53:57 -06:00
Brenden Matthews
e8e6d1c819
Few misc doc related things.
...
Added the (incomplete) check_docs.py, to 'synchronize' the docs with the
code, as well as vim/nano syntax stuff.
Removed some unused OBJ_* stuff from text_objects.h, and updated docs
with some missing things. Also removed a couple deprecated objects
which were still documented.
2009-05-01 16:53:50 -06:00
Nikolas Garofil
e05e9ece8e
Added the combine variable
2009-04-30 21:05:59 +02:00
Brenden Matthews
cf97fd3b52
Why do we still have a kdevelop file in here?
2009-04-28 15:22:05 -06:00
Brenden Matthews
55a388a907
Disable config-output on FreeBSD.
2009-04-28 15:22:00 -06:00
Jérôme Plût
ff9154216b
Make ALSA mixers available on Linux, and added $if_mixer_mute.
2009-04-28 10:56:49 -06:00
Brenden Matthews
2dfc0ee6b4
Fix minor environment variable bug.
2009-04-28 10:54:43 -06:00
Brenden Matthews
d1b6548c55
Minor for for mail args parsing.
2009-04-28 10:19:28 -06:00
Lassi Selander
49aee8707a
Various XMMS2 updates (thanks Lassi).
2009-04-28 10:02:24 -06:00
Phil Sutter
fb8ccd7a05
fix for enviroment variable expansion
2009-04-26 22:49:46 +02:00
Nikolas Garofil
6bc19d0396
Workaround for the problem that $goto only moves the first rss-item by making
...
it possible to specify the number of spaces you want in front of each rss-item
2009-04-19 00:42:01 +02:00
Nikolas Garofil
86b91db305
Bugfix: compilation without X11 broke after latest patches
2009-04-13 14:42:31 +02:00
Brenden Matthews
77f818168b
Update docs.
2009-04-09 20:18:19 -06:00
Brenden Matthews
506f6ecc3b
Special default & gauge fixes.
2009-04-09 20:10:08 -06:00
Brenden Matthews
acfef7760f
Clarify $tab arguments.
2009-04-09 17:08:01 -06:00
Brenden Matthews
38ee788da4
Added default_bar/graph/gauge_size config options (thanks wire64 for the idea)
2009-04-09 16:00:40 -06:00
Or Cohen
b6e691e8ac
Minor fix for fs_used_perc, fs_free and fs_free_perc
2009-04-09 15:34:12 -06:00
Brenden Matthews
ea34b2c5e5
Fix xmms2 related compilation error?
2009-04-09 15:33:50 -06:00
Phil Sutter
7001e95186
be consistent when parsing args of cpu objects
...
The inconsistent naming of the cpu parameter in the docs led me to this,
so I also simplified parsing by introducing the macro SCAN_CPU(). Note
that this introduces a syntactical change to the config: the cpuN
argument now has to be passed at first position to $cpugraph.
2009-04-04 01:25:33 +02:00
Nikos Ntarmos
45ee67ae7e
fs_free -> fs_used in conky.conf for consistency (feature request #2633000 )
...
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:55:29 -06:00
Nikos Ntarmos
f91faa64b8
Add X11 display argument/conf entry (FR #2474243 )
...
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:46:16 -06:00
Brenden Matthews
508df32b5a
Don't need debian stuff either.
2009-03-29 23:37:49 -06:00
Brenden Matthews
e276de100d
Don't really need ebuilds in here anymore.
2009-03-29 23:37:21 -06:00
Brenden Matthews
a301b24a8e
Fix compile error.
2009-03-29 23:35:42 -06:00
Brenden Matthews
9f6c13e16a
Fix charset of changelog.
2009-03-29 23:18:17 -06:00
Brenden Matthews
595b22fcce
Don't strip control chars from man page.
...
If you're using `less' to view the readme, it should display properly.
If we run the man page through `col', it results in weird characters
hanging around.
2009-03-29 22:56:29 -06:00
Brenden Matthews
f05829ad9a
Update copyright stuff, fix conky.conf weirdness.
2009-03-29 22:55:51 -06:00
Brenden Matthews
edc8857b4f
Update changelog.
2009-03-29 21:32:24 -06:00
Brenden Matthews
0d4f9499eb
Fixed bug in template stuff.
2009-03-29 20:27:38 -06:00
