Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
1,705 Commits 5 Branches 46 Tags 22 MiB
1a86405cd9
Commit Graph

1147 Commits

Author SHA1 Message Date
Brenden Matthews
87dfc68374 Clean up x11.c a bit. 2009-07-27 15:34:27 -06:00
Cesare Tirabassi
57f65ec30c Fix user_times bug (launchpad #405188). 2009-07-27 15:32:01 -06:00
Brenden Matthews
bad9f86c85 Fix linking error with Lua extras disabled. 2009-07-27 15:03:50 -06:00
Brenden Matthews
786bc27d41 Add vim modelines. 2009-07-27 14:47:19 -06:00
Brenden Matthews
0c2d7d542e Be more intelligent about handling tolua++ user types. 
Conflicts:

	src/llua.c
 2009-07-27 14:08:42 -06:00
Nikolas Garofil
fdbadce291 use EXIT_SUCCESS and EXIT_FAILURE instead of 0 and 1 when calling exit 2009-07-27 01:33:28 +02:00
Nikolas Garofil
81f82b4b81 Handle if popen should fail 2009-07-25 14:37:09 +02:00
Nikolas Garofil
41f9e67f96 Fix: Make sure lua works without X11 2009-07-25 02:42:50 +02:00
Cesare Tirabassi
981014e9d7 Fixed parsing of rss parameters (last 2 are optional) and typo in rss.c; there is still a problem with feed_titlesince data->title doesn't get filled before processing 2009-07-24 14:41:04 +02:00
Nikolas Garofil
51f77cb525 bugfix 2009-07-24 11:44:23 +02:00
Nikolas Garofil
fbcd06f767 Fix unclosed file in get_battery_stuff 2009-07-24 11:09:26 +02:00
Nikolas Garofil
ba4ca41779 Fix CRIT_ERR everywhere 2009-07-23 20:31:13 +02:00
Nikolas Garofil
163e16d286 Fix memleak in $weather 2009-07-23 18:50:08 +02:00
Nikolas Garofil
d2f7bd9609 Fix bug SF ID 2814810 (wrong output with execp and execpi) 2009-07-23 13:34:17 +02:00
Nikolas Garofil
71d5121ea2 Let $tail and $head work with FIFOs again (was disabled by commit 41a7cffbe7 ), and fix memory bug when to_real_path is used in init_tailhead 2009-07-22 22:09:15 +02:00
Nikolas Garofil
5a027864d5 Fix bug with SF id 2808272 (tail and head) 
To fix this bug the tail and head code was rewritten, everything should still
work except tailing a FIFO instead of a normal head.
 2009-07-21 23:45:30 +02:00
Nikolas Garofil
0c159ca440 Fix multiline stuff when build with X11 but output_to_x turned off. 
This commit reverts 725a3ba43a and fixes 5967d28511
 2009-07-21 13:21:33 +02:00
Brenden Matthews
636ba55909 Fix multiline stuff without X11. 2009-07-20 20:11:56 -06:00
Brenden Matthews
5d0e3922aa Revert "Fix multiline strings displayed on 1 line when output to x is not used" 
This reverts commit 5967d28511.
 2009-07-20 17:48:39 -06:00
Nikolas Garofil
4f7668a007 Fix multiline strings displayed on 1 line when output to x is not used 2009-07-20 17:18:02 -06:00
Brenden Matthews
c655ab12d2 Clarify weather opts, refactor some weather code. 2009-07-20 13:18:05 -06:00
Brenden Matthews
4872b4984f Actually apply c1cf1232e0. 2009-07-20 12:41:00 -06:00
Brenden Matthews
9aeae3419c Document curl stuff better. 2009-07-20 12:03:16 -06:00
Nikos Ntarmos
fe980cc5b9 Teach freebsd.c to use the new CRIT_ERR format 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
 2009-07-20 11:51:35 -06:00
Brenden Matthews
beed56a095 Better argument handling for rss/curl/weather. 2009-07-20 10:00:14 -06:00
Nikolas Garofil
bd36e214a7 Include timed_thread.h when needed 2009-07-20 10:00:10 -06:00
Brenden Matthews
8b0b7814d1 Oops, add missing files. 2009-07-20 09:22:12 -06:00
Brenden Matthews
b1d5d1f803 Fix minor memleak. 2009-07-20 00:40:44 -06:00
Brenden Matthews
64394fa7da Merge branch 'master' of git.omp.am:/home/omp/git/conky 
Conflicts:
	configure.ac.in
 2009-07-19 23:45:55 -06:00
Brenden Matthews
c05c157ead Overhauled RSS and weather, added $curl. 
I've taken the curl stuff out of weather and RSS and moved it into it's
own entity.  It should be easier to create curl-based objects if needed
now.
 2009-07-19 23:43:36 -06:00
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
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
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
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