Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 12:10:31 +00:00
Code Issues Releases Activity
2,255 Commits 5 Branches 46 Tags 22 MiB
029eee8118
Commit Graph

1623 Commits

Author SHA1 Message Date
Pavel Labath
3f7be35406 Fix segfault in ccurl_thread.c 
curl_global_init() is not thread-safe, it must be called at the start of main()
 2010-08-29 13:31:18 +02:00
Brenden Matthews
dadc49b09f Fix crash in mail stuff due to bad free(). 2010-08-26 10:32:27 -07:00
Pavel Labath
9fc26df1f6 fix compilation errors in previous commit 2010-08-24 22:30:32 +02:00
Pavel Labath
a4ac595240 Fix segfault in i8k (sf.net #3007167) 
Apparently, sometimes the value of i8k.right_fan_status is sometimes null. This just makes sure
the null value isn't passed to atoi(3). A better solution would be to figure out why is it null,
but I cannot do that as I don't have the hardware.
 2010-08-20 23:35:33 +02:00
Pavel Labath
841c0c962f fix typo 2010-08-16 16:42:05 +02:00
Pavel Labath
74392a5491 Use getaddrinfo instead of gethostbyname 
Patches conky to use getaddrinfo instead of gethostbyname everywhere. gethostbyname is rather
flawed and doesn't support IPv6 properly.

Patch contributed by Pascal Bleser
 2010-08-15 19:58:03 +02:00
Brenden Matthews
a25985f00b Build fix for IBM support when X is disabled. 
See http://bugs.gentoo.org/show_bug.cgi?id=331171 for details.
 2010-08-13 10:58:35 -07:00
Pavel Labath
252376912f Fix 'nvidia with ncurses segfaults' (sf.net #3006233) 
Additionally, add a nvidia_display variable. This enables the $nvidia variable to be used without
out_to_x yes (X11 support still has to be built in, you just don't have to use it).
 2010-08-13 15:05:05 +02:00
Pavel Labath
472a80be90 Make $fs_used_perc and $fs_bar report used space correctly 
they reported fs->size - fs->avail, which is not correct if fs has super-user reserved blocks.

note that now $fs_used_perc and $fs_free_perc need not add up to 100%, but that is consistent
with what $fs_used and $fs_free do.
 2010-08-12 20:41:28 +02:00
Pavel Labath
ad4f12281b Fix buffer overflows in eve.c (sf.net #3034056) 2010-08-12 17:21:45 +02:00
Pavel Labath
b8a5c57acb Fix gcc warning 2010-07-29 16:29:11 +02:00
Brenden Matthews
cf870c1c6c Fix bug where IMAP doesn't refresh counts after IDLE timeout. 2010-06-18 16:09:11 -07:00
Brenden Matthews
8b53d902d3 Change a debug printf to DBGP. 2010-06-18 12:02:34 -07:00
Brenden Matthews
b03541a91c Fix segfault in mail folder (SF: 3007493) 2010-06-18 12:00:11 -07:00
Brenden Matthews
da1926344d Revert "Fix segfault in mail folder (SF: 3007493)" 
This reverts commit a78d9538fc.
 2010-06-18 11:34:49 -07:00
Brenden Matthews
f753f6edfb Fix bug in IMAP idle, reduce IDLE timeout. 2010-06-18 11:29:05 -07:00
Brenden Matthews
77aa301d51 Fix alignment ($align[rc]) issue for exec & lua objects. 2010-06-18 11:15:01 -07:00
Brenden Matthews
6c26b12a39 Revert "Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse" 
This reverts commit 691036e3c3.
 2010-06-18 11:02:49 -07:00
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
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
Pavel Labath
516ffa41b7 Merge branch '1.8.0' into 1.8.1 2010-03-13 01:15:33 +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
Nikolas Garofil
29f013b34d Fix wrong output when nesting $combine-s 2010-02-22 19:35:03 +01:00
Nikolas Garofil
80ee83c87f Fix memleak 2010-02-22 16:50:10 +01:00
Nikolas Garofil
7a8c1e45c8 Fix memleak 2010-02-22 16:49:38 +01:00
Nikolas Garofil
87a33551f7 Fix output of $combine when used in combination with $head 2010-02-22 16:35:25 +01:00
Nikolas Garofil
f48124bdea Fix output of $combine when used in combination with $head 2010-02-22 16:34:14 +01:00
Nikolas Garofil
caf38b3a12 Fix current_mail_spool memleak 2010-02-18 01:34:19 +01:00
Nikolas Garofil
7bf902f14a Fix current_mail_spool memleak 2010-02-18 01:33:49 +01:00
Nikolas Garofil
53e4299162 Fix memleak in if_match 2010-02-17 20:36:01 +01:00
Nikolas Garofil
597586f289 Fix memleak in if_match 2010-02-17 20:34:53 +01:00
Pavel Labath
7bec4e0be8 Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:45:22 +01:00
Pavel Labath
3b7454fd9b Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:44:22 +01:00
Ben Kibbey
edaf742295 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:32:01 -08:00
Ben Kibbey
93d8b01f48 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:31:52 -08:00
Cesare Tirabassi
2c33e6e565 Fix last commit which fails to build when X11 is not enabled 
(cherry picked from commit 925e80ac11)
 2010-02-17 12:43:53 +01:00
Cesare Tirabassi
925e80ac11 Fix last commit which fails to build when X11 is not enabled 2010-02-17 12:38:05 +01:00
Nikolas Garofil
ac6dff791f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:22 +01:00
Nikolas Garofil
29ef435c8f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:02 +01:00
Nikolas Garofil
656177e0de Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:04:25 +01:00
Nikolas Garofil
96c059773b Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:03:31 +01:00
Pavel Labath
6526b47b2c Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:38:15 +01:00
Pavel Labath
ab55088784 Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:36:04 +01:00
Cesare Tirabassi
d2ce1d2909 Replaces commit 44e3708cdb 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
(cherry picked from commit 1eedf2633b)
 2010-01-31 21:00:37 +01:00
Cesare Tirabassi
1eedf2633b Replaces commit 44e3708cdb 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
 2010-01-31 20:57:02 +01:00
Cesare Tirabassi
da510d34a6 Extend commit 2568030509 to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
(cherry picked from commit 99fd8ef380)
 2010-01-31 12:00:29 +01:00
Cesare Tirabassi
99fd8ef380 Extend commit 2568030509 to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
 2010-01-31 11:57:09 +01:00
Cesare Tirabassi
9e5739e612 Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:27:01 +01:00
Cesare Tirabassi
9601693afa Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0 2010-01-30 19:24:19 +01:00
Cesare Tirabassi
d620ac6f0f Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:23:31 +01:00
Pavel Labath
44a4ffae91 Merge branch '1.8.0' into 1.8.1 2010-01-30 17:56:22 +01:00
Pavel Labath
fcc6524db2 Fix small logic error in diskiograph_read/write 2010-01-30 17:48:03 +01:00
Cesare Tirabassi
3db07e589f Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 
(cherry picked from commit 44e3708cdb)
 2010-01-30 14:24:40 +01:00
Brenden Matthews
8cb56def23 Only ever fork() once. 
(cherry picked from commit 000acfe0fd)
 2010-01-30 14:24:06 +01:00
Cesare Tirabassi
44e3708cdb Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 2010-01-30 14:19:38 +01:00
Brenden Matthews
c5925930c3 Merge branch '1.8.0' into 1.8.1 
Conflicts:
	src/conky.c
 2010-01-26 13:05:59 -08:00
Brenden Matthews
000acfe0fd Only ever fork() once. 2010-01-26 13:05:04 -08:00
Brenden Matthews
61ad0c2159 Only pause during startup, not after reload. 2010-01-26 12:39:15 -08:00
Brenden Matthews
0ae9108874 Only pause during startup, not after reload. 2010-01-26 12:37:16 -08:00
Pavel Labath
60a6194b84 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)
 2010-01-24 16:12:31 +01:00