1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 09:44:04 +00:00
Commit Graph

2281 Commits

Author SHA1 Message Date
labath
5d2857e0bc Merge pull request #3 from jwm-art-net/1.9.1
1.9.1 autotools modernizations
2013-01-15 12:57:39 -08:00
James Morris
b0a22d534d cut $HOME when $HOME not found 2013-01-12 17:07:23 +00:00
James Morris
a1d1a4f076 fix mem corruption originating in load_xoap_keys 2013-01-12 17:05:52 +00:00
James Morris
588c296784 minor autotools modernization take 2 2013-01-12 15:24:06 +00:00
James Morris
a8d12cceb5 minor modernization of autotools files 2013-01-12 13:32:57 +00:00
Georg Hopp
81dc114723 remove commented code 2013-01-10 11:45:59 -08:00
Georg Hopp
36c3401a42 fix imap message count updates 2013-01-10 11:45:54 -08:00
Pavel Labath
bfaa84bd77 Fix wlan stats segfault (sf.net #3581218)
Sometimes wlan related TEXT causes segment fault, and backtrace shows it's strtok in
iw_get_stats.

I read the code of wireless_tools, which says 'strtok not thread safe, not used in WE-12 and
later' for iw_get_stats. But it need to first check if has_range and then we_version_compiled.

In conky/src/linux.cc, iw_get_stats is called before iw_get_range_info, hence has_range is always
0 in iw_get_stats and strtok is used. I simply move iw_get_range_info before iw_get_stats and no
segfault up to now.

patch by ruikai
2012-11-01 15:05:52 +01:00
Pavel Labath
2c024f9a86 Fix curl-related crashes (sf.net #3386728)
curl implements some of the timeouts using alarm(), where the alarm handler longjmp()s back into the
curl code. This is a bad idea in multi-threaded applications, since it is not guaranteed that
SIGALARM will be recieved by the correct thread. Therefore, we instruct curl to avoid using
signals.
2012-10-20 13:04:11 +02:00
Pavel Labath
8a6f985fb9 MPD: add mpd_albumartist (sf.net #3532376)
Adds mpd_albumartist support as an object since mpd_artist lists all participating artists of the
current song and not the main album artist.

patch by Sébastien Lavoie-Courchesne
2012-10-07 11:46:31 +02:00
Pavel Labath
f388c14086 Fix drawing of line graphs (sf.net #3557517)
patch by dmrdmr.
2012-10-05 23:54:00 +02:00
Pavel Labath
9d399607dd Do not truncate non-human-readable numbers to 32bit (sf.net #3564560)
patch by hdastwb
2012-10-01 23:30:05 +02:00
Pavel Labath
1c1feb7db2 Fix a memory leak in top.c (sf.net #3543857)
The leak was caused by commit 8827d61, attempting to solve a problem with top displaying 10th
process incorrectly.

I think there should be a more elegant solution to this, but I don't know how to find it atm
(it could be due the fact that it's 4am here).
2012-07-20 04:19:38 +02:00
Pavel Labath
fd9462da5e Fix "conky failes to build with --disable-ncurses" (sf.net #3541329) 2012-07-13 13:41:09 +02:00
Pavel Labath
410c89ab1c Fix "Using log-scaled graph with show_graph_scale causes segfault" (sf.net #3538674)
bug reported by Nikslay
2012-06-28 18:21:38 +02:00
Pavel Labath
2011665234 Fix shades, this time for real 2012-06-27 22:35:54 +02:00
Pavel Labath
818df1078c Bugfix: Shades weren't placed correct after a $goto 2012-06-27 16:10:09 +02:00
Pavel Labath
8827d6158e Fix an off-by-one in top.c (sf.net #3538234)
bug reported by arclance
2012-06-26 23:22:59 +02:00
Pavel Labath
623560267b Fix a segfault in graph drawing code (sf.net #3537523)
PS: boy, is that code messy or what

bug reported by b3niup
2012-06-26 22:40:56 +02:00
Pavel Labath
dcbc73b151 Fix building on Debian GNU/kFreeBSD (sf.net #3525356) 2012-06-04 16:26:33 +02:00
Pavel Labath
807f93f814 Fix `using "draw_shades yes" lua script runs twice per update' (sf.net #3524540)
bugreported by arclance
2012-06-03 16:20:17 +02:00
Nikolas Garofil
4a6c9519a1 fix racecondition in eve, based on a patch from Vasiliy Kulikov, based on a patch from Brandon 2012-06-03 16:01:50 +02:00
Pavel Labath
68240f4a9e Enable apcupsd and iostats on Debian GNU/kFreeBSD (sf.net #3525358)
reported by Vincent C.
2012-06-03 15:31:11 +02:00
Brenden Matthews
e1390cb3e6 Enable NetBSD support.
Based on patches from:

http://pkgsrc-wip.cvs.sourceforge.net/viewvc/pkgsrc-wip/wip/conky/patches/
2012-05-07 10:55:03 -07:00
Brenden Matthews
5c3a6581d1 Update version, copyright. 2012-05-03 16:32:24 -07:00
Brenden Matthews
04a0c8850f Bump for release. 2012-05-03 14:35:33 -07:00
Brenden Matthews
029eee8118 Remove unneeded variables. 2012-05-03 14:22:32 -07:00
Alessandro Di Marco
f5850b713a New graph switch (-d) turning histograms into lines
Signed-off-by: Alessandro Di Marco <dmr@ethzero.com>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
2012-05-03 14:13:47 -07:00
Brenden Matthews
ccc3dd1147 Version bump. 2012-05-03 14:05:28 -07:00
Brenden Matthews
83bf5e3f85 Build fix for Lua >=5.2.
See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089.
2012-03-07 11:11:12 -08:00
Pavel Labath
d884152376 add mpd_date function that shows date for current track (sf.net #3440445)
patch submitted by Andrey Tikhonov
2012-01-29 21:12:21 +01:00
Pavel Labath
00c9687c21 Fix "rhost undeclared" (sf.net #3466456)
patch by Jaromír Cápík
2012-01-03 10:36:43 +01:00
Pavel Labath
bf06e2afa3 Fix spelling error in the manpage
noticed by Vincent C.
2011-12-08 12:46:45 +01:00
Pavel Labath
742dbbffaa Fix execi when interval is larger than system uptime (sf.net #3432429)
bug reported by Deciare
2011-11-05 17:21:23 +01:00
Pavel Labath
505a4bb6b1 Use statfs64 for $fs_* to support very large volumes
bug reported by puppetm.
2011-11-01 16:18:11 +01:00
Brenden Matthews
97ff689cf4 RFC 3501 only requires + for IMAP continuation. 2011-10-25 15:57:45 -07:00
Brenden Matthews
586da564b5 Fix IMAP regression from b751e93291. 2011-10-25 15:33:17 -07:00
Brenden Matthews
8891495558 Fix another regression from c1277d650b. 2011-10-25 15:32:52 -07:00
Brenden Matthews
c1277d650b Fix for regression introduced by 951cb1ac7e. 2011-10-25 15:19:45 -07:00
Brenden Matthews
9a0402341b Check for ncurses correctly. 2011-10-25 10:53:59 -07:00
Pavel Labath
f6aac5981e Increase MAX_NET_INTERFACES to 64
also change a magic constant in net_stat.h to reflect the fact that it depends on
MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505
2011-10-25 18:53:09 +02:00
Pavel Labath
1248fd2139 Fix graph updating for large (>512pix) graphs (sf.net #3253656)
apparently, this was actually a feature as someone made it deliberately act that way. However, I
agree with the bug reporter that it is strange so I remove it.
2011-10-23 20:51:55 +02:00
Pavel Labath
152cdb4cc3 Fix xmms2 stream updating (sf.net #3150884)
Currently the variables related to xmms2 in conky do not update if the currently playing track
has any of its information updated (ie: the title changes). This results in incorrect behaviour
for streams where the same track is continually played but the title and artist change as new
songs are played. The attached patch corrects this issue by changing conky to respond to a
callback that fires when xmms2 media library entries are updated. After the callback fires, the
patch checks to see if the media library entry that changed corresponds to the currently playing
song and if it does updates the conky xmms2 related variables accordingly.

A different version of the patch was previously submitted and accepted into conky. Unfortunately,
this patch contained a bug that caused conky xmms2 variables to be updated when any media library
information was updated. However, the previous patch was reverted as a result of a commit the
made conky compatible with a new version of the xmms2 client api.

Patch submitted by Tamim Khan.

Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2011-10-19 16:39:08 +02:00
Pavel Labath
21c4e8a3ef Remove now obsolete comment about quotes in execgraph in docs 2011-10-18 19:51:32 +02:00
Pavel Labath
d6aab26cfa Make execgraph working again (sf.net #3185428)
ps: the graph parsing code is a mess and in desperate need of a rewrite, that's why i'm not
pushing this code to master, as it's only a stop-gap measure
2011-10-18 19:48:49 +02:00
Pavel Labath
b751e93291 Support IMAP responses which arrive fragmented (sf.net #3182411)
bug reported by Richard De Boer
2011-10-16 12:04:42 +02:00
Nikolas Garofil
f9025174bc 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
2011-10-15 19:39:43 +02:00
Pavel Labath
324de5934e Ignore whitespace in parameters of $pid_* (sf.net #3423766)
This enables one to pass the output of $top to these variables. It was not possible before,
because $top pads the pids with spaces.
2011-10-15 14:11:04 +02:00
Pavel Labath
70032e713a Don't abort when config references a non-existant hwmon file
this sort of fixes sf.net #3306538. The person there correctly tested for the existance of the
file with $if_existing, but the problem is we run the callbacks regardless of the conditional
tests.
2011-10-15 14:10:40 +02:00
Pavel Labath
8905dbb313 Add uid to "top" output (sf.net #3178916)
original patch submitted by Thomas Wiegner, I added support for printing of raw uids.
2011-10-10 21:54:18 +02:00