From d1b6548c551e62405002d0096a4564538cf372dd Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@rty.ca>
Date: Tue, 28 Apr 2009 10:19:28 -0600
Subject: [PATCH] Minor for for mail args parsing.

---
 src/conky.c | 6 +++---
 src/mail.c  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index 693b1a5a..86afd212 100644
--- 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 015167fb..15e9ae56 100644
--- 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') {