Minor for for mail args parsing.

diff --git a/src/conky.c b/src/conky.c
index 693b1a5..86afd21 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -2951,9 +2951,9 @@ static inline struct mail_s *ensure_mail_thread(struct text_object *obj,
                return obj->data.mail;
        } else if (!obj->a) {
                // something is wrong, warn once then stop
-               ERR("Theres a problem with your %s_unseen settings.  "
-                               "Check that the global %s settings are defined "
-                               "properly (line %li).", global_text, global_text, obj->line);
+               ERR("There's a problem with your mail settings.  "
+                               "Check that the global mail settings are properly defined"
+                               "(line %li).", obj->line);
                obj->a++;
        }
        return NULL;

diff --git a/src/mail.c b/src/mail.c
index 015167f..15e9ae5 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -281,6 +281,7 @@ struct mail_s *parse_mail_args(char type, const char *arg)
                } else if (type == IMAP_TYPE) {
                        ERR("Scanning POP3 args failed");
                }
+               return 0;
        }
        // see if password needs prompting
        if (mail->pass[0] == '*' && mail->pass[1] == '\0') {