Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

Browse Source
This commit is contained in:
Nikolas Garofil 2009-07-19 23:34:31 +02:00
commit f245aff685
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -245,4 +245,4 @@ EXTRA_DIST = \
imlib2.h
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:

2
src/conky.c
View File

@ -9283,7 +9283,7 @@ void initialisation(int argc, char **argv) {
fprintf(stderr, PACKAGE_NAME": forked to background, pid is %d\n",
pid);
fflush(stderr);
return;
exit(EXIT_SUCCESS);
}
}

2
src/rss.c
View File

@ -144,7 +144,7 @@ PRSS *get_rss_info(char *uri, int delay)
curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-rss/1.0");
res = curl_easy_perform(curl);
if (chunk.size) {
if (res == CURLE_OK && chunk.size) {
curdata = prss_parse_data(chunk.memory);
free(chunk.memory);
} else {

2
src/weather.c
View File

@ -552,7 +552,7 @@ void fetch_weather_info(location *curloc)
curl_easy_setopt(curl, CURLOPT_USERAGENT, "conky-weather/1.0");
res = curl_easy_perform(curl);
if (chunk.size) {
if (res == CURLE_OK && chunk.size) {
timed_thread_lock(curloc->p_timed_thread);
parse_weather(&curloc->data, chunk.memory);
timed_thread_unlock(curloc->p_timed_thread);