Nikolas Garofil [Mon, 12 Apr 2010 12:40:15 +0000 (14:40 +0200)]
Bugfix: mixerbar showed wrong values
Nikolas Garofil [Mon, 12 Apr 2010 10:45:10 +0000 (12:45 +0200)]
Bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC
Nikolas Garofil [Sun, 11 Apr 2010 17:49:27 +0000 (19:49 +0200)]
Bugfix: battery_bar should also work without argument
Nikolas Garofil [Sat, 10 Apr 2010 18:06:04 +0000 (20:06 +0200)]
Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed
Brenden Matthews [Wed, 7 Apr 2010 17:59:45 +0000 (10:59 -0700)]
Fix X error when border_width is <1.
Brenden Matthews [Wed, 7 Apr 2010 17:20:25 +0000 (10:20 -0700)]
Fix device name parsing for diskio variables.
See:
https://sourceforge.net/tracker/?func=detail&aid=2981517&group_id=143975&atid=757308
Brenden Matthews [Wed, 7 Apr 2010 17:14:45 +0000 (10:14 -0700)]
Fix bug in $if_existing.
Ref:
http://sourceforge.net/tracker/?func=detail&aid=2979974&group_id=143975&atid=757308
Brenden Matthews [Wed, 7 Apr 2010 16:34:33 +0000 (09:34 -0700)]
Fix build failure with ncurses disabled.
Ref: http://bugs.gentoo.org/show_bug.cgi?id=313081
Pavel Labath [Thu, 18 Mar 2010 20:35:15 +0000 (21:35 +0100)]
Merge branch '1.8.0' into 1.8.1
Pavel Labath [Thu, 18 Mar 2010 20:31:18 +0000 (21:31 +0100)]
Fix a leak in mpd.c (refcount fail)
Cesare Tirabassi [Sat, 13 Mar 2010 18:28:45 +0000 (19:28 +0100)]
Fix doc re. mixer names
(cherry picked from commit
1fe99bc578106379bc642dd47daee081f9db563f)
Cesare Tirabassi [Sat, 13 Mar 2010 18:29:17 +0000 (19:29 +0100)]
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
Cesare Tirabassi [Sat, 13 Mar 2010 18:28:45 +0000 (19:28 +0100)]
Fix doc re. mixer names
Pavel Labath [Sat, 13 Mar 2010 00:15:33 +0000 (01:15 +0100)]
Merge branch '1.8.0' into 1.8.1
Pavel Labath [Sat, 13 Mar 2010 00:14:30 +0000 (01:14 +0100)]
yikes, fix editing fail, thanks norsetto
Pavel Labath [Sat, 6 Mar 2010 12:34:18 +0000 (13:34 +0100)]
Fix iwlib detection in certain situations
Brenden Matthews [Wed, 3 Mar 2010 19:21:41 +0000 (11:21 -0800)]
Build fix due to bad include ordering.
Pavel Labath [Wed, 3 Mar 2010 10:59:15 +0000 (11:59 +0100)]
Merge branch '1.8.0' into 1.8.1
Conflicts:
configure.ac.in
Pavel Labath [Wed, 3 Mar 2010 10:56:25 +0000 (11:56 +0100)]
Fix crash when using $desktop_name with out_to_x no
Cesare Tirabassi [Tue, 2 Mar 2010 19:26:59 +0000 (20:26 +0100)]
Fix sf: #2961602
Add missing --quiet option and optional arguments to --pause and --interval
(cherry picked from commit
a9e5820a3454f27cdb388f988f21d154aa2c9cce)
Cesare Tirabassi [Tue, 2 Mar 2010 19:26:59 +0000 (20:26 +0100)]
Fix sf: #2961602
Add missing --quiet option and optional arguments to --pause and --interval
Pavel Labath [Sun, 28 Feb 2010 13:05:28 +0000 (14:05 +0100)]
s/substract/subtract/
Pavel Labath [Sun, 28 Feb 2010 13:05:28 +0000 (14:05 +0100)]
s/substract/subtract/
Nikolas Garofil [Tue, 23 Feb 2010 13:41:11 +0000 (14:41 +0100)]
Fix removing the config and sending a SIGUSR1 results in segfault
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
Nikolas Garofil [Tue, 23 Feb 2010 13:38:08 +0000 (14:38 +0100)]
Fix removing the config and sending a SIGUSR1 results in segfault
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
Cesare Tirabassi [Mon, 22 Feb 2010 21:45:51 +0000 (22:45 +0100)]
Fix LP: #525926; conky sigsegv if config file is deleted
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
(cherry picked from commit
085c39d39464642746a1883266d9dffcfc10e84c)
Cesare Tirabassi [Mon, 22 Feb 2010 21:45:51 +0000 (22:45 +0100)]
Fix LP: #525926; conky sigsegv if config file is deleted
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
Nikolas Garofil [Mon, 22 Feb 2010 18:35:36 +0000 (19:35 +0100)]
Fix wrong output when nesting $combine-s
Nikolas Garofil [Mon, 22 Feb 2010 18:35:03 +0000 (19:35 +0100)]
Fix wrong output when nesting $combine-s
Nikolas Garofil [Mon, 22 Feb 2010 15:50:10 +0000 (16:50 +0100)]
Fix memleak
Nikolas Garofil [Mon, 22 Feb 2010 15:49:38 +0000 (16:49 +0100)]
Fix memleak
Nikolas Garofil [Mon, 22 Feb 2010 15:35:25 +0000 (16:35 +0100)]
Fix output of $combine when used in combination with $head
Nikolas Garofil [Mon, 22 Feb 2010 15:34:14 +0000 (16:34 +0100)]
Fix output of $combine when used in combination with $head
Nikolas Garofil [Thu, 18 Feb 2010 00:34:19 +0000 (01:34 +0100)]
Fix current_mail_spool memleak
Nikolas Garofil [Thu, 18 Feb 2010 00:33:49 +0000 (01:33 +0100)]
Fix current_mail_spool memleak
Nikolas Garofil [Wed, 17 Feb 2010 19:36:01 +0000 (20:36 +0100)]
Fix memleak in if_match
Nikolas Garofil [Wed, 17 Feb 2010 19:34:53 +0000 (20:34 +0100)]
Fix memleak in if_match
Pavel Labath [Wed, 17 Feb 2010 18:55:39 +0000 (19:55 +0100)]
Update docs to be consistent with changes in previous commit
Pavel Labath [Wed, 17 Feb 2010 18:55:39 +0000 (19:55 +0100)]
Update docs to be consistent with changes in previous commit
Pavel Labath [Wed, 17 Feb 2010 18:43:16 +0000 (19:43 +0100)]
Try to make $if_match better handle stranger inputs
This should fix sf.net #2953283
Pavel Labath [Wed, 17 Feb 2010 18:43:16 +0000 (19:43 +0100)]
Try to make $if_match better handle stranger inputs
This should fix sf.net #2953283
Ben Kibbey [Sun, 7 Feb 2010 15:46:00 +0000 (10:46 -0500)]
Added AF_UNIX socket support.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Ben Kibbey [Sun, 7 Feb 2010 15:46:00 +0000 (10:46 -0500)]
Added AF_UNIX socket support.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Cesare Tirabassi [Wed, 17 Feb 2010 11:38:05 +0000 (12:38 +0100)]
Fix last commit which fails to build when X11 is not enabled
(cherry picked from commit
925e80ac11f53726515d33d9d59081e65872718c)
Cesare Tirabassi [Wed, 17 Feb 2010 11:38:05 +0000 (12:38 +0100)]
Fix last commit which fails to build when X11 is not enabled
Nikolas Garofil [Fri, 12 Feb 2010 17:57:22 +0000 (18:57 +0100)]
Fix wrong mixer values on some systems (thanks hoffa)
Nikolas Garofil [Fri, 12 Feb 2010 17:57:02 +0000 (18:57 +0100)]
Fix wrong mixer values on some systems (thanks hoffa)
Nikolas Garofil [Fri, 12 Feb 2010 02:04:25 +0000 (03:04 +0100)]
Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock
Nikolas Garofil [Fri, 12 Feb 2010 02:03:31 +0000 (03:03 +0100)]
Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock
Pavel Labath [Wed, 3 Feb 2010 21:36:04 +0000 (22:36 +0100)]
Fix compilation without --enable-argb
Bug reported by zaphire
Pavel Labath [Wed, 3 Feb 2010 21:36:04 +0000 (22:36 +0100)]
Fix compilation without --enable-argb
Bug reported by zaphire
Cesare Tirabassi [Sun, 31 Jan 2010 19:57:02 +0000 (20:57 +0100)]
Replaces commit
44e3708cdb204782d728ddd6a40dec230bb9299c
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
(cherry picked from commit
1eedf2633bfe822d80f6215d53730de473207f25)
Cesare Tirabassi [Sun, 31 Jan 2010 19:57:02 +0000 (20:57 +0100)]
Replaces commit
44e3708cdb204782d728ddd6a40dec230bb9299c
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
Cesare Tirabassi [Sun, 31 Jan 2010 10:57:09 +0000 (11:57 +0100)]
Extend commit
25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.
This is still a workaround, the underlining starvation issue remains
unsolved.
(cherry picked from commit
99fd8ef38080a873bee67cd7742e5c67048aeb63)
Cesare Tirabassi [Sun, 31 Jan 2010 10:57:09 +0000 (11:57 +0100)]
Extend commit
25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.
This is still a workaround, the underlining starvation issue remains
unsolved.
Brenden Matthews [Sat, 30 Jan 2010 19:12:59 +0000 (11:12 -0800)]
Bump for an RC3, if needed.
Cesare Tirabassi [Sat, 30 Jan 2010 18:27:01 +0000 (19:27 +0100)]
Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?)
Cesare Tirabassi [Sat, 30 Jan 2010 18:24:19 +0000 (19:24 +0100)]
Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
Cesare Tirabassi [Sat, 30 Jan 2010 18:23:31 +0000 (19:23 +0100)]
Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?)
Pavel Labath [Sat, 30 Jan 2010 16:56:22 +0000 (17:56 +0100)]
Merge branch '1.8.0' into 1.8.1
Pavel Labath [Sat, 30 Jan 2010 16:48:03 +0000 (17:48 +0100)]
Fix small logic error in diskiograph_read/write
Cesare Tirabassi [Sat, 30 Jan 2010 13:19:38 +0000 (14:19 +0100)]
Fix diskio total computation for kernel > 2.6.31 (sf: #2942117)
(cherry picked from commit
44e3708cdb204782d728ddd6a40dec230bb9299c)
Brenden Matthews [Tue, 26 Jan 2010 21:05:04 +0000 (13:05 -0800)]
Only ever fork() once.
(cherry picked from commit
000acfe0fd6fa0d6f6e284676af079e8ef9397d8)
Cesare Tirabassi [Sat, 30 Jan 2010 13:19:38 +0000 (14:19 +0100)]
Fix diskio total computation for kernel > 2.6.31 (sf: #2942117)
Brenden Matthews [Tue, 26 Jan 2010 21:05:59 +0000 (13:05 -0800)]
Merge branch '1.8.0' into 1.8.1
Conflicts:
src/conky.c
Brenden Matthews [Tue, 26 Jan 2010 21:05:04 +0000 (13:05 -0800)]
Only ever fork() once.
Brenden Matthews [Tue, 26 Jan 2010 20:37:16 +0000 (12:37 -0800)]
Only pause during startup, not after reload.
Brenden Matthews [Tue, 26 Jan 2010 20:37:16 +0000 (12:37 -0800)]
Only pause during startup, not after reload.
Pavel Labath [Sun, 24 Jan 2010 14:34:03 +0000 (15:34 +0100)]
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)
Pavel Labath [Sun, 24 Jan 2010 14:34:03 +0000 (15:34 +0100)]
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)
Pavel Labath [Tue, 19 Jan 2010 23:01:01 +0000 (00:01 +0100)]
Make conky not crash when drawing on root window
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
Pavel Labath [Tue, 19 Jan 2010 23:01:01 +0000 (00:01 +0100)]
Make conky not crash when drawing on root window
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
Nikolas Garofil [Sun, 17 Jan 2010 20:39:59 +0000 (21:39 +0100)]
Bump version
Pavel Labath [Sun, 17 Jan 2010 18:35:35 +0000 (19:35 +0100)]
Another off-by-one found by valgrind.
Pavel Labath [Sun, 17 Jan 2010 18:35:35 +0000 (19:35 +0100)]
Another off-by-one found by valgrind.
Dmitry Marakasov [Sat, 16 Jan 2010 18:53:19 +0000 (10:53 -0800)]
Add SMP support for FreeBSD.
Original patch written by Ivan Klymenko <fidaj@ukr.net>.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Nikolas Garofil [Sat, 16 Jan 2010 03:01:49 +0000 (04:01 +0100)]
signed to unsigned before comparing
Nikolas Garofil [Sat, 16 Jan 2010 01:30:01 +0000 (02:30 +0100)]
Fix compiling with x11 by setting argb default on
Pavel Labath [Fri, 15 Jan 2010 22:41:04 +0000 (23:41 +0100)]
Fix "off-by-one" bug in hddtemp found by valgrind
Pavel Labath [Thu, 7 Jan 2010 21:27:25 +0000 (22:27 +0100)]
Fix $execbar et al.
Brenden Matthews [Wed, 6 Jan 2010 18:17:40 +0000 (10:17 -0800)]
Fix small logic error in diskio.
Cesare Tirabassi [Tue, 5 Jan 2010 16:08:20 +0000 (17:08 +0100)]
Fix sigsegv if cpu_usage has not yet been populated
Brenden Matthews [Sat, 2 Jan 2010 22:22:46 +0000 (14:22 -0800)]
Fix some minor memleaks, fix crash on reload.
It seems that closing xft fonts on reload is a bad idea, but this seems
to result in a memory leak. As far as I can tell, the leak doesn't grow
beyond the initial allocation however.
Brenden Matthews [Sat, 2 Jan 2010 21:31:09 +0000 (13:31 -0800)]
Added disable_auto_reload option, callback fixes.
There were some issues with reloading and the threaded callback
framework, which I think are mostly resolved now, but may need more
testing.
Brenden Matthews [Sat, 2 Jan 2010 20:12:21 +0000 (12:12 -0800)]
Fix reload problem with ARGB.
Brenden Matthews [Sat, 2 Jan 2010 19:38:44 +0000 (11:38 -0800)]
Improve handling of ARGB visuals a bit.
Brenden Matthews [Sat, 2 Jan 2010 18:43:01 +0000 (10:43 -0800)]
Bump rev.
Brenden Matthews [Sat, 2 Jan 2010 18:39:45 +0000 (10:39 -0800)]
Fix build error for IBM/smapi support.
Cesare Tirabassi [Thu, 31 Dec 2009 22:49:02 +0000 (23:49 +0100)]
The HAPPY NEW YEAR commit
This should close sf #2850092.
Basically, before this change, for strings which includes
SECRIT_MULTILINE_CHAR the computed maximum substring width was getting
summed to the width of the last substring.
The old behaviour is kept but for the case of strings including
SECRIT_MULTILINE_CHAR, for which now the maximum width of all substrings
is taken.
I don't think this will break anything else but blame me if it does ...
(cherry picked from commit
72bbe51a8c323702db76094e27266e67cc1ba5b5)
Cesare Tirabassi [Sun, 27 Dec 2009 22:07:16 +0000 (23:07 +0100)]
Fix some typos in documentation
(cherry picked from commit
c8a99a865adbd862bf74c0ca310fda796601fb5f)
Cesare Tirabassi [Wed, 9 Dec 2009 22:29:44 +0000 (23:29 +0100)]
remove <programlisting> from variables.xml, it only messes the man page and serve no other purpose
(cherry picked from commit
a14cca6592ec506b1a535be43912b4a72b40f11f)
Brenden Matthews [Fri, 1 Jan 2010 23:45:11 +0000 (15:45 -0800)]
Update copyright notices.
Brenden Matthews [Fri, 1 Jan 2010 23:10:29 +0000 (15:10 -0800)]
Bump to release candidate 1.
danielb [Fri, 1 Jan 2010 23:01:51 +0000 (15:01 -0800)]
Add ARGB visual support.
This patch adds the possibility to use a argb visual for the conky
window. Adding a boolean configuration entry 'own_window_argb_visual'.
the 'set_transparent_background' method sets the alpha bytes of the argb
color for transparency, instead of pseudo transparency. This patch
would close following feature request:
https://sourceforge.net/tracker/?func=detail&aid=1563931&group_id=143975&at
id=757311 and would be a workaround for some reported transparency bugs
(https://sourceforge.net/tracker/?func=detail&aid=1968923&group_id=143975&a
tid=757308 for example)
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Lassi Selander [Fri, 1 Jan 2010 22:53:31 +0000 (14:53 -0800)]
XMMS2 - fix version check
Adds minimum version check for XMMS2 client libs. I couldn't get it to
check exact version cause pkg-config gets confused with XMMS2's version
number containing spaces.. Anyway it's better than not check at all.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Ben Kibbey [Fri, 1 Jan 2010 22:51:46 +0000 (14:51 -0800)]
$scroll fix for a text length <= length
This fixes $scroll to only scroll when the text length is greater than
the specified length; hopefully without breaking anything.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Ben Kibbey [Fri, 1 Jan 2010 22:49:35 +0000 (14:49 -0800)]
Fix hddtemp with disabled drives.
Some drives are unable to return their temperature when in standby mode.
If there is more than one drive installed then other drives may not be
able to get parsed. This patch will skip over the unparsable output for
the current drive and let others get parsed.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Nikos Ntarmos [Wed, 16 Dec 2009 14:21:44 +0000 (16:21 +0200)]
tolua++ has different naming convention on FreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Phil Sutter [Sun, 13 Dec 2009 02:47:26 +0000 (03:47 +0100)]
simplify this conditional a bit
Phil Sutter [Sat, 12 Dec 2009 23:28:01 +0000 (00:28 +0100)]
fix doc typo and add highlighting for times_in_seconds