2 files changed, 5 insertions, 8 deletions
diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c
index 74ea8c3461..32d25becf1 100644
--- a/camel/providers/mbox/camel-mbox-store.c
+++ b/camel/providers/mbox/camel-mbox-store.c
@@ -28,7 +28,7 @@
 #include "camel-mbox-store.h"
 #include "camel-mbox-folder.h"
 #include "camel-exception.h"
-#include "url-util.h"
+#include "camel-url.h"
 
 /* Returns the class for a CamelMboxStore */
 #define CMBOXS_CLASS(so) CAMEL_MBOX_STORE_CLASS (GTK_OBJECT(so)->klass)
@@ -88,7 +88,7 @@ camel_mbox_store_get_type (void)
 const gchar *
 camel_mbox_store_get_toplevel_dir (CamelMboxStore *store)
 {
-	Gurl *url = CAMEL_SERVICE (store)->url;
+	CamelURL *url = CAMEL_SERVICE (store)->url;
 
 	g_assert(url != NULL);
 	return url->path;
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 543a6ce532..f14ed1dc55 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -40,8 +40,8 @@
 #include "camel-stream-fs.h"
 #include "camel-session.h"
 #include "camel-exception.h"
+#include "camel-url.h"
 #include "md5-utils.h"
-#include "url-util.h"
 
 /* Specified in RFC 1939 */
 #define POP3_PORT 110
@@ -205,7 +205,7 @@ pop3_connect (CamelService *service, CamelException *ex)
 {
 	struct hostent *h;
 	struct sockaddr_in sin;
-	int port, fd, status, apoplen;
+	int fd, status, apoplen;
 	char *buf, *apoptime, *pass;
 	CamelPop3Store *store = CAMEL_POP3_STORE (service);
 
@@ -215,9 +215,6 @@ pop3_connect (CamelService *service, CamelException *ex)
 	h = camel_service_gethost (service, ex);
 	if (!h)
 		return FALSE;
-	port = camel_service_getport (service, "pop3", POP3_PORT, "tcp", ex);
-	if (port == -1)
-		return FALSE;
 
 	pass = g_strdup (service->url->passwd);
 	if (!pass) {
@@ -233,7 +230,7 @@ pop3_connect (CamelService *service, CamelException *ex)
 	}
 
 	sin.sin_family = h->h_addrtype;
-	sin.sin_port = port;
+	sin.sin_port = htons (service->url->port ? service->url->port : POP3_PORT);
 	memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
 
 	fd = socket (h->h_addrtype, SOCK_STREAM, 0);