Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity
2,173 Commits 5 Branches 46 Tags 22 MiB
abda74d9fc
Commit Graph

2173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenden Matthews
abda74d9fc Add missing include. 2010-06-18 10:35:41 -07:00
Pavel Labath
dfdbbddc36 Ignore spaces in {} when breaking up arguments to $lua 2010-06-18 17:58:18 +02:00
Pavel Labath
d8f5239360 Small build fix & zero playtime and progress bars when XMMS2 playback is stopped. 
patch contributed by sleipner
 2010-06-13 19:12:24 +02:00
Brenden Matthews
c4a0916e6b Build fix for IBM support. 2010-06-08 17:59:06 -07:00
Nikolas Garofil
a78d9538fc Fix segfault in mail folder (SF: 3007493) 2010-06-02 19:22:44 +02:00
Nikolas Garofil
6c750d09f2 use free instead of free_and_zero (it's not available in this branch and zero-ing is not necessary here) 2010-06-02 18:33:59 +02:00
Nikolas Garofil
9932a975e2 fix tiny memleak when $top is used wrong 2010-05-30 17:20:54 +02:00
Alexander Graf
10bd81e77c ${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>
 2010-05-28 21:41:38 +02:00
Alexander Graf
a44b3c3f47 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>
 2010-05-28 21:41:38 +02:00
Cesare Tirabassi
8564ff6610 Fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195) 2010-05-23 11:08:08 +02:00
Nikolas Garofil
8121073912 Make sure audacious-code compiles 2010-05-09 22:52:27 +02:00
Nikolas Garofil
acbb531adf Bugfix: RSS interval was in secs instead of mins 2010-05-06 12:00:43 +02:00
Nikolas Garofil
691036e3c3 Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse 2010-05-05 22:13:09 +02:00
Nikolas Garofil
13188c8b11 Bugfix: memory and thread-deleting problems 
This patch is the C version of a32d9e41a4
(from the master branch).
 2010-05-05 18:57:27 +02:00
Nikolas Garofil
36ebcf347d Bugfix: read_tcp treated a succesfull connection as failed and vice versa 2010-04-15 19:56:14 +02:00
Nikolas Garofil
6b3c69882a Bugfix: "out_to_x no" was ignored when in a file included with ${include path_to_file} 2010-04-14 21:27:56 +02:00
Laurent Papier
9e3156a4a6 Add $nodename_short. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-04-12 17:41:23 -07:00
Nikolas Garofil
df5de28d17 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
 2010-04-13 02:36:50 +02:00
Nikolas Garofil
0443579095 Bugfix: adding/removing use_xft in the config had no effect unless you restarted conky, reloading the config was not enough 2010-04-12 23:36:20 +02:00
Daniel Pielmeier
b36fc94885 Fix building with Audacious >= 2.3 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-04-12 14:24:42 -07:00
Brenden Matthews
48659dd402 Don't use alarm() in texeci to terminate long processes. 2010-04-12 14:09:44 -07:00
Pavel Labath
13c973d1b5 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
 2010-04-12 22:45:03 +02:00
Nikolas Garofil
02d97f9445 Bugfix: mixerbar showed wrong values 2010-04-12 14:40:15 +02:00
Nikolas Garofil
99eeeae6d0 Bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC 2010-04-12 12:45:10 +02:00
Nikolas Garofil
9a334e4462 Bugfix: battery_bar should also work without argument 2010-04-11 19:49:27 +02:00
Nikolas Garofil
f7dcc664d7 Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed 2010-04-10 20:06:04 +02:00
Brenden Matthews
c9f1625908 Fix X error when border_width is <1. 2010-04-07 10:59:45 -07:00
Brenden Matthews
04fd11b631 Fix device name parsing for diskio variables. 
See:
https://sourceforge.net/tracker/?func=detail&aid=2981517&group_id=143975&atid=757308
 2010-04-07 10:20:25 -07:00
Brenden Matthews
9c5e5d86bd Fix bug in $if_existing. 
Ref:
http://sourceforge.net/tracker/?func=detail&aid=2979974&group_id=143975&atid=757308
 2010-04-07 10:14:45 -07:00
Brenden Matthews
c8e6874065 Fix build failure with ncurses disabled. 
Ref: http://bugs.gentoo.org/show_bug.cgi?id=313081
 2010-04-07 09:34:33 -07:00
Pavel Labath
0a0a18656c Merge branch '1.8.0' into 1.8.1 2010-03-18 21:35:15 +01:00
Pavel Labath
c3f28e192a Fix a leak in mpd.c (refcount fail) 2010-03-18 21:34:11 +01:00
Cesare Tirabassi
0471aef596 Fix doc re. mixer names 
(cherry picked from commit 1fe99bc578)
 2010-03-13 19:30:29 +01:00
Cesare Tirabassi
b93fced933 Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0 2010-03-13 19:29:17 +01:00
Cesare Tirabassi
1fe99bc578 Fix doc re. mixer names 2010-03-13 19:28:45 +01:00
Pavel Labath
516ffa41b7 Merge branch '1.8.0' into 1.8.1 2010-03-13 01:15:33 +01:00
Pavel Labath
323e360e6f yikes, fix editing fail, thanks norsetto 2010-03-13 01:14:30 +01:00
Pavel Labath
56629f7e60 Fix iwlib detection in certain situations 2010-03-06 13:34:18 +01:00
Brenden Matthews
acfbad9b16 Build fix due to bad include ordering. 2010-03-03 11:21:41 -08:00
Pavel Labath
e639ad45ae Merge branch '1.8.0' into 1.8.1 
Conflicts:
	configure.ac.in
 2010-03-03 11:59:15 +01:00
Pavel Labath
0c83d64a86 Fix crash when using $desktop_name with out_to_x no 2010-03-03 11:56:25 +01:00
Cesare Tirabassi
fde58c9d93 Fix sf: #2961602 
Add missing --quiet option and optional arguments to --pause and --interval
(cherry picked from commit a9e5820a34)
 2010-03-02 20:29:15 +01:00
Cesare Tirabassi
a9e5820a34 Fix sf: #2961602 
Add missing --quiet option and optional arguments to --pause and --interval
 2010-03-02 20:26:59 +01:00
Pavel Labath
e6a220b3a7 s/substract/subtract/ 2010-02-28 14:06:18 +01:00
Pavel Labath
1dc3870c8a s/substract/subtract/ 2010-02-28 14:06:05 +01:00
Nikolas Garofil
ba06e0acad 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
 2010-02-23 14:41:11 +01:00
Nikolas Garofil
72f5aa7ece 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
 2010-02-23 14:38:08 +01:00
Cesare Tirabassi
8ca6ea6aec 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 085c39d394)
 2010-02-22 22:48:32 +01:00
Cesare Tirabassi
085c39d394 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?
 2010-02-22 22:45:51 +01:00
Nikolas Garofil
d35aad5bfa Fix wrong output when nesting $combine-s 2010-02-22 19:35:36 +01:00