1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Commit Graph

1564 Commits

Author SHA1 Message Date
Phil Sutter
533075032a Fix hostname resolution for mpd_host
When getaddrinfo() returns an IPv6 address, connect() fails since mpd
does not support IPv6. Reproduced by adding the name "localhost" to the
"::1" entry in /etc/hosts.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-30 19:55:06 -06:00
Alexander Graf
0632693be7 Fix if_existing
The if_existing with 2 arguments checking whether a file contains a specified
string did not work. This is fixed by this patch.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-30 16:21:42 -06:00
Brenden Matthews
39071d28e8 Be more graceful when handling IMAP problems. 2009-05-29 23:31:03 -06:00
Brenden Matthews
a31efb7fbe Fix default sizing for bars/graphs/gauges.
Conflicts:

	src/conky.c
2009-05-29 14:05:10 -06:00
Nikos Ntarmos
15eb14da5c conf_cookie is there for kFreeBSD as well
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-29 10:57:17 -06:00
Nikos Ntarmos
8553e33763 Include bsd/bsd.h on kFreeBSD
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-29 10:57:17 -06:00
Brenden Matthews
650c39b602 Compilation fixes, fix a segfault on shutdown.
There was a missing 'break' in a switch/case statement which caused a
segfault on shutdown when using $if_up.
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
b51d06d178 Gracefully exit from main_loop()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
c03655bdfa free(3) previously strdup(3)'ed disp
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:56 -06:00
Nikos Ntarmos
613a440fdc XDestroyRegion(3) only for non-NULL regions
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
0c62f02553 XCloseDisplay(3) on re-init_X11()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
ff72a55691 No need to check for loop variable value
If the first for-loop succedds in finding the desired interface, it will return to its caller. The only way we drop to the second for-loop is if nothing is found thus far, so no need to check for (i == 16).

Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
33451a9420 free(3) previously strndup(3)'ed diskio.dev
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
dc2a8e1de8 free(3) strdup(3)'ed templates array
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Nikos Ntarmos
a8300acbc5 free(3) previously strndup(3)'ed netstats.dev
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Brenden Matthews
ed5dbc02bb Simplify graph gradient stuff. 2009-05-26 11:44:16 -06:00
Brenden Matthews
d65c33146e OMPtimize the gradient stuff. 2009-05-26 03:14:52 -06:00
Brenden Matthews
b0f37a63e8 Let the graphs be bigger. 2009-05-24 23:31:35 -06:00
Brenden Matthews
35a72f5a95 Fix some minor graph related bugs. 2009-05-24 23:16:36 -06:00
Brenden Matthews
d03df4a367 Allow ~/... and $HOME/... paths for more stuff. 2009-05-24 22:33:47 -06:00
Brenden Matthews
f1cc5cf032 Actually fix hddtemp parsing. 2009-05-24 18:15:05 -06:00
Brenden Matthews
1c4044252c Revert "Fix array bounds problem in hddtemp code."
This reverts commit d0de7cbd63.
2009-05-24 18:02:46 -06:00
Brenden Matthews
c92272a943 Fix segfault on reload. 2009-05-24 17:49:50 -06:00
Brenden Matthews
d0de7cbd63 Fix array bounds problem in hddtemp code. 2009-05-24 17:09:38 -06:00
Brenden Matthews
4a08fab0e6 Fix clipping, enable alpha for imlib2. 2009-05-24 16:52:48 -06:00
Brenden Matthews
4ec728fa42 Added fancy new 'temperature gradients' feature.
See docs for more details on 'temperature gradients', which can be
turned on with the -t switch on graphs.  Also improved parsing of
options with $execgraph and $execigraph, but may cause some breakage.
2009-05-24 15:53:32 -06:00
Brenden Matthews
ee9364522a Some OpenMP related fixes.
Fixes for commit 9c331dce49.
2009-05-24 14:02:33 -06:00
Brenden Matthews
19ca4c071a Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 13:48:10 -06:00
Brenden Matthews
4bfd545d2f Clip out imlib2 buffer properly. 2009-05-24 13:47:44 -06:00
Joe Myre
7b7d038035 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-05-24 14:24:07 -05:00
Brenden Matthews
06044bf7e5 Try and fix weirdness with hwmon/i2c/platform options. 2009-05-24 13:07:27 -06:00
Joe Myre
9c331dce49 omped it up 2009-05-24 10:41:35 -05:00
Brenden Matthews
bf2d9de16a Add OpenMP to list of compiled in features (for -v). 2009-05-23 21:18:06 -06:00
Nikos Ntarmos
8da700b8c1 Delay checking for want_apcupsd.
The if-clause checking for the host operating system being Linux may
change the value of want_apcupsd. Delay checking for its value until
after that.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:32 -06:00
Nikos Ntarmos
45e403f553 Allow src/apcupsd.c to compile cleanly on FreeBSD.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:32 -06:00
Nikos Ntarmos
12d0d1477f Integrate FreeBSD diskio support.
This diff moves Linux-specific parts of diskio.c into linux.c and uses
the remaining diskio functions to correctly implement this functionality
for FreeBSD. It also hooks diskio.c to the FreeBSD build.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:32 -06:00
Nikos Ntarmos
ec2597f944 Revert "Disable config-output on FreeBSD."
This reverts commit a54fa6a8f4.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:31 -06:00
Nikos Ntarmos
0880c1722d Remove unused variables and rearrange includes.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:31 -06:00
Nikos Ntarmos
38d4030e65 conf_cookie valid only for Linux.
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-23 21:08:31 -06:00
Brenden Matthews
396494d4a0 Fixed parsing of $hwmon? 2009-05-23 21:01:59 -06:00
Brenden Matthews
c9951a3bac Better checking for cases when inotify doesn't work. 2009-05-22 12:48:46 -06:00
Brenden Matthews
0dc7041e6f Fix other parsing bug with hwmon. 2009-05-22 12:30:09 -06:00
Brenden Matthews
1779ef3efd Fix (possibly overkill) hwmon parsing bug. 2009-05-22 12:29:41 -06:00
Brenden Matthews
7f0929d03c Fix imlib2 cache setting. 2009-05-22 11:23:05 -06:00
Brenden Matthews
445fde109c Fix backwards width/height args for image drawing. 2009-05-22 01:39:38 -06:00
Brenden Matthews
3ad217e447 Use original image size when not specified. 2009-05-22 01:18:07 -06:00
Brenden Matthews
0907f1035a Bump to 1.7.2. 2009-05-21 23:03:06 -06:00
Brenden Matthews
b6dea2fce6 Oops, null pointer. 2009-05-20 11:53:43 -06:00
Brenden Matthews
a25e030036 Oh yeah, make sure it compiles without inotify.
Also removed BSD licensing stuff that pertains to old torsmo code.
2009-05-19 22:56:33 -06:00
Brenden Matthews
75d1a054be Add message to show the Lua script was reloaded. 2009-05-19 22:51:50 -06:00