Brenden Matthews [Wed, 9 Jun 2010 00:59:06 +0000 (17:59 -0700)]
Build fix for IBM support.
Nikolas Garofil [Wed, 2 Jun 2010 17:22:44 +0000 (19:22 +0200)]
Fix segfault in mail folder (SF: 3007493)
Nikolas Garofil [Wed, 2 Jun 2010 16:33:59 +0000 (18:33 +0200)]
use free instead of free_and_zero (it's not available in this branch and zero-ing is not necessary here)
Nikolas Garofil [Sun, 30 May 2010 15:20:54 +0000 (17:20 +0200)]
fix tiny memleak when $top is used wrong
Alexander Graf [Fri, 28 May 2010 15:28:21 +0000 (17:28 +0200)]
${top} fixes for FreeBSD
${top}, ${top_mem} and ${top_time} are now recognized as variables. The
parts of code doing this were in a #ifdef __linux__.
The total CPU time of processes (${top} with "time" argument) is now
printable, and ${top_time} works.
Signed-off-by: Alexander Graf <agraf@znc.in>
Alexander Graf [Fri, 28 May 2010 14:53:13 +0000 (16:53 +0200)]
Fix build errors under FreeBSD
Makefile.am: top.c was enlisted as Linux-only source, though it is
required for conky on every operating system.
conky.[ch]: top_running definition was inside #ifdef __linux__, though
required by top.c on every operating system.
freebsd.c: Change return type of update_*() to int, as required by
common.h; remove free_all_processes() as it is defined by top.c. The
changes done to freebsd.c must be done to netbsd.c and openbsd.c, too.
I did not do it as I have no opportunity to test conky under NetBSD or
OpenBSD.
Signed-off-by: Alexander Graf <agraf@znc.in>
Cesare Tirabassi [Sun, 23 May 2010 09:08:08 +0000 (11:08 +0200)]
Fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195)
Nikolas Garofil [Sun, 9 May 2010 20:52:27 +0000 (22:52 +0200)]
Make sure audacious-code compiles
Nikolas Garofil [Thu, 6 May 2010 10:00:43 +0000 (12:00 +0200)]
Bugfix: RSS interval was in secs instead of mins
Nikolas Garofil [Wed, 5 May 2010 20:13:09 +0000 (22:13 +0200)]
Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
Nikolas Garofil [Wed, 5 May 2010 16:57:27 +0000 (18:57 +0200)]
Bugfix: memory and thread-deleting problems
This patch is the C version of
a32d9e41a440a043e19d20e3b91a45f626297472
(from the master branch).
Nikolas Garofil [Thu, 15 Apr 2010 17:56:14 +0000 (19:56 +0200)]
Bugfix: read_tcp treated a succesfull connection as failed and vice versa
Nikolas Garofil [Wed, 14 Apr 2010 19:27:56 +0000 (21:27 +0200)]
Bugfix: "out_to_x no" was ignored when in a file included with ${include path_to_file}
Laurent Papier [Tue, 13 Apr 2010 00:41:23 +0000 (17:41 -0700)]
Add $nodename_short.
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Nikolas Garofil [Tue, 13 Apr 2010 00:36:50 +0000 (02:36 +0200)]
Removed all code depending on MIXER_IS_ALSA
Reasons:
-As far as i know, all systems can use the non-MIXER_IS_ALSA way to get the values
-This code shows wrong mixer values
Nikolas Garofil [Mon, 12 Apr 2010 21:36:20 +0000 (23:36 +0200)]
Bugfix: adding/removing use_xft in the config had no effect unless you restarted conky, reloading the config was not enough
Daniel Pielmeier [Mon, 12 Apr 2010 21:24:42 +0000 (14:24 -0700)]
Fix building with Audacious >= 2.3
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
Brenden Matthews [Mon, 12 Apr 2010 21:09:44 +0000 (14:09 -0700)]
Don't use alarm() in texeci to terminate long processes.
Pavel Labath [Mon, 12 Apr 2010 20:40:16 +0000 (22:40 +0200)]
inotifi_init1() is not available on older systems
-> replace with inotify_init() + fcntl()
atomicity should not be important here, since we don't have any threads running at the point of
the call
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.