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

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

This commit is contained in:
Cesare Tirabassi 2009-07-24 13:07:20 +02:00
parent 381b47a0a9
commit 0be6e37e07
2 changed files with 2 additions and 2 deletions

View File

@ -2848,7 +2848,7 @@ static struct text_object *construct_text_object(const char *s,
argc = sscanf(arg, "%127s %f %63s %d %u", uri, &interval, action, argc = sscanf(arg, "%127s %f %63s %d %u", uri, &interval, action,
&act_par, &nrspaces); &act_par, &nrspaces);
if (argc == 5) { if (argc >= 3) {
obj->data.rss.uri = uri; obj->data.rss.uri = uri;
obj->data.rss.interval = interval > 0 ? interval * 60 : 15*60; obj->data.rss.interval = interval > 0 ? interval * 60 : 15*60;
obj->data.rss.action = action; obj->data.rss.action = action;

View File

@ -54,7 +54,7 @@ void rss_process_info(char *p, int p_max_size, char *uri, char *action, int
curloc->process_function = &prss_parse_data; curloc->process_function = &prss_parse_data;
ccurl_init_thread(curloc, interval); ccurl_init_thread(curloc, interval);
if (!curloc->p_timed_thread) { if (!curloc->p_timed_thread) {
ERR("error setting up weather thread"); ERR("error setting up RSS thread");
} }
} }