Fixed parsing of rss parameters (last 2 are optional) and typo in rss.c; there is...

diff --git a/src/conky.c b/src/conky.c
index 3f732b3..64f5070 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -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,
                                        &act_par, &nrspaces);
-                       if (argc == 5) {
+                       if (argc >= 3) {
                                obj->data.rss.uri = uri;
                                obj->data.rss.interval = interval > 0 ? interval * 60 : 15*60;
                                obj->data.rss.action = action;

diff --git a/src/rss.c b/src/rss.c
index 4603b9c..4912479 100644 (file)
--- a/src/rss.c
+++ b/src/rss.c
@@ -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;
                ccurl_init_thread(curloc, interval);
                if (!curloc->p_timed_thread) {
-                       ERR("error setting up weather thread");
+                       ERR("error setting up RSS thread");
                }
        }