1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Commit Graph

2059 Commits

Author SHA1 Message Date
Nikolas Garofil
09d41cb0b6 Fix building without X11 support broke after commits f1c47e5fc4 and 670e9a0eb1 2009-07-20 01:02:27 +02:00
Cesare Tirabassi
ba414d8ab8 fix out-of-tree builds 2009-07-20 00:43:41 +02:00
Nikolas Garofil
f245aff685 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-07-19 23:34:31 +02:00
Nikolas Garofil
afdda37729 Fixed a tiny bug in configure.ac.in
From the automake docs:
"Note that you must arrange for every AM_CONDITIONAL to be invoked every time configure is run -- if AM_CONDITIONAL is run conditionally (e.g., in a shell if statement), then the result will confuse automake."
2009-07-19 23:31:11 +02:00
Brenden Matthews
80a71ea8bd Handle curl errors better (in weather and rss). 2009-07-19 15:28:19 -06:00
Brenden Matthews
e76f0c8587 Exit properly when forking. 2009-07-19 14:55:41 -06:00
Nikolas Garofil
4c41ec843a fix hardcoding 2009-07-19 21:56:07 +02:00
Nikolas Garofil
f1c47e5fc4 Fix instead of workaround for d0edfa7004 2009-07-19 21:28:14 +02:00
Brenden Matthews
4139ec096f Code formatting. 2009-07-19 12:12:42 -06:00
Brenden Matthews
6f1c578e70 Ammend changelog. 2009-07-19 12:02:23 -06:00
Brenden Matthews
90932b87e1 Update MPD elapsed/progress when stopped. 2009-07-19 11:59:20 -06:00
Cesare Tirabassi
50fd16d8bd add XOAP to list of compiled-in features, if enabled 2009-07-19 18:14:22 +02:00
Cesare Tirabassi
0b846a112d updated configure print summary with new XOAP flag 2009-07-19 17:46:11 +02:00
Nikolas Garofil
d0edfa7004 Workaround for bug SF id 2819128 ($color inside $scroll disabled) 2009-07-19 00:36:05 +02:00
Brenden Matthews
1f1b846a2d Specials can be within multi-line objects. 2009-07-18 14:25:57 -06:00
Brenden Matthews
52ad674e51 Substitute newlines for everything but text. 2009-07-18 14:00:02 -06:00
Brenden Matthews
9c4ebef376 Oops, fix multiline stuff. 2009-07-18 13:49:52 -06:00
Brenden Matthews
670e9a0eb1 Multiline alignment support, some other misc stuff.
Added support for X alignment across multi-lined objects (i.e., using
$alignr with $exec).  This may be a bit buggy.  Disabled OpenMP code
until GCC's implementation stabilizes (it's causing too many problems).
A couple Lua API changes.
2009-07-18 13:46:36 -06:00
Cesare Tirabassi
5eef83d90a add compilation switch --enable-xoap to be able to use www.weather.com as a source of weather data 2009-07-18 21:29:27 +02:00
Cesare Tirabassi
3bb9b4b6b5 Revert "Undid last 3 commits, see rest of the comment for the reason:"
First of all, we may or may not agree, but I consider reverting my
commits without prior discussion as a minimum unpolite.
I also don't like sites that oblige to register, thats the very reason
why I went with noaa first (and why I use that myself).
Howver, weather.com has a couple of nice features forom an user
viewpoint:

1. Their icons can be used to add a visual quality to the weather
report.
2. They have forecast data, which is not possible to have with noaa
(using TAF its an option, but its going to be very difficult and will
be limited in time and scope).

Nobody is obliged to do anything, people who likes noaa will use noaa,
people that don't mind register or wants the additional benefit will use
weather.com.
Having libxms2 as a dragged depends is, first of all, also with other
options (rss and eve), second we can try to work around it with an
additional compilation flag if really deemed necessary.

This reverts commit d872562942.
2009-07-18 19:13:37 +02:00
Nikolas Garofil
d872562942 Undid last 3 commits, see rest of the comment for the reason:
I am not really comfortable with adding support to the conky-code
for sites that only work when you register, that's more something
for in a script.
But the biggest reason I undid the commits is that it is now
impossible to compile conky with support for weather if you don't
have the xml libs installed. Users used to be able to compile with
support for weather (using the other site) without xml2.
If you really want to include this other site in the conky code
then split WEATHER in WEATHERCOM and WEATHERNOAA (altough my personal
opinion is that weather.com should only be supported with scripts)
2009-07-18 16:22:43 +02:00
Cesare Tirabassi
7b38e810f2 add one missing ifdef to conditionally compile weather code 2009-07-18 16:07:17 +02:00
Cesare Tirabassi
806b840646 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-18 16:00:49 +02:00
Cesare Tirabassi
46fc4a0564 Added www.weather.com as an additional source of weather data 2009-07-18 15:59:43 +02:00
Nikolas Garofil
4284490080 If nothing is read, n1 and n2 are not guaranteed to be 0 2009-07-18 11:37:15 +02:00
Nikolas Garofil
b94569b27b Fix reloading config without X11 2009-07-18 10:49:16 +02:00
Cesare Tirabassi
cba36f279b weather: use expf if --enable_math is given, otherwise use fast 3rd order approximation 2009-07-18 07:57:04 +02:00
Cesare Tirabassi
0bc0f46101 weather: glib is not needed 2009-07-18 06:48:58 +02:00
Cesare Tirabassi
4e73ab2dd2 Revert "weather: glib is not needed"
This reverts commit d9cb095441.
2009-07-18 06:47:17 +02:00
Cesare Tirabassi
25fcd618d4 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-18 06:42:25 +02:00
Cesare Tirabassi
d9cb095441 weather: glib is not needed 2009-07-18 06:39:54 +02:00
Nikolas Garofil
85deafa500 Fix bug in $scroll (if there were only 2 args the 2nd couldn't be numerical) 2009-07-18 01:15:09 +02:00
Nikolas Garofil
e905c7d4f1 Fix building without X11 after commit 20d4c4370a 2009-07-17 18:37:46 +02:00
Nikolas Garofil
20d4c4370a Fix memleaks when reloading configuration and place same parts of main() and reload_config() in a seperate function 2009-07-17 18:01:41 +02:00
Nikolas Garofil
06de5573e8 Fix a lot of unimportant memleaks caused by a CRIT_ERR 2009-07-16 20:28:23 +02:00
Nikolas Garofil
63a8c677b3 Show warnings when not running in X and vars like desktop or monitor are used 2009-07-16 00:31:22 +02:00
Nikolas Garofil
4ec308ef12 Fix freeing unregistered mem when build when running without X 2009-07-15 23:55:22 +02:00
Nikolas Garofil
4c241bbf16 Fix all memleaks that are clearly visible,
the default config should now run without memleaks, valgrind will
still report memleaks caused by the own_window-lines and the xft-lines
(in some cases) but those are caused by code that's not part of conky
2009-07-15 16:33:18 +02:00
Nikolas Garofil
4addf71241 Make 16768a5ad4 C90-compliant 2009-07-14 19:17:14 +02:00
Cesare Tirabassi
1e5bc370e4 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-14 18:47:00 +02:00
Cesare Tirabassi
16768a5ad4 Fix Property Change Events are passes also to OWN_WINDOW 2009-07-14 18:46:15 +02:00
Nikolas Garofil
cd92949e67 Fix strange effects on desktop caused by 4a14668772 2009-07-14 18:10:43 +02:00
Nikolas Garofil
cfa94a967b Fix memleaks introduced by g7bbde2b 2009-07-14 18:05:49 +02:00
Nikolas Garofil
d75fb18bf8 Fix building with strict compilers 2009-07-14 17:43:27 +02:00
Cesare Tirabassi
7bbde2be73 refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window 2009-07-14 16:57:51 +02:00
Nikolas Garofil
4a14668772 Fix a part of the memleaks in the X-related code,
if you remove all lines above TEXT in defconfig.h,
then it should run without memleaks.
2009-07-14 16:07:33 +02:00
Nikolas Garofil
c924bbe194 Fix memleaks when running with total_run_times 2009-07-14 12:47:24 +02:00
Brenden Matthews
0352b96f39 Use OBJ_THREAD() for weather, get rid of pointless return. 2009-07-13 16:11:21 -06:00
Brenden Matthews
73194dee89 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-13 15:21:42 -06:00
Brenden Matthews
74c19cf8e4 Fix minor $weather memleak. 2009-07-13 15:21:25 -06:00