evolution-data-server r9638 - trunk/camel/providers/pop3

[fejj svn gnome org]

Author: fejj
Date: Thu Oct  2 21:20:27 2008
New Revision: 9638
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9638&view=rev

Log:
2008-10-02  Jeffrey Stedfast  <fejj novell com>

	* camel-pop3-store.c (pop3_try_authenticate): Return -1 if we fail
	to get a password, not 0.



Modified:
   trunk/camel/providers/pop3/ChangeLog
   trunk/camel/providers/pop3/camel-pop3-store.c

Modified: trunk/camel/providers/pop3/camel-pop3-store.c
==============================================================================
--- trunk/camel/providers/pop3/camel-pop3-store.c	(original)
+++ trunk/camel/providers/pop3/camel-pop3-store.c	Thu Oct  2 21:20:27 2008
@@ -489,7 +489,7 @@
 		g_free (base_prompt);
 		g_free (full_prompt);
 		if (!service->url->passwd)
-			return 0;
+			return -1;
 	}
 
 	if (!service->url->authmech) {
@@ -558,13 +558,14 @@
 					"Error sending username: %s"),
 				      CAMEL_SERVICE (store)->url->host,
 				      store->engine->line ? (char *)store->engine->line : _("Unknown error"));
-	} else if (pcp->state != CAMEL_POP3_COMMAND_OK)
+	} else if (pcp->state != CAMEL_POP3_COMMAND_OK) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
 				      _("Unable to connect to POP server %s.\n"
 					"Error sending password: %s"),
 				      CAMEL_SERVICE (store)->url->host,
 				      store->engine->line ? (char *)store->engine->line : _("Unknown error"));
-
+	}
+	
 	camel_pop3_engine_command_free (store->engine, pcp);
 
 	if (pcu)