[evolution-data-server/email-factory] Pick UID Cache from the right location.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 6eaa6f6211fb2c54a3f2434127031d5d1869f495
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Wed Jun 1 17:16:54 2011 +0530

    Pick UID Cache from the right location.

 mail/daemon/mail-ops.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/mail/daemon/mail-ops.c b/mail/daemon/mail-ops.c
index 958815a..70b06ba 100644
--- a/mail/daemon/mail-ops.c
+++ b/mail/daemon/mail-ops.c
@@ -226,10 +226,17 @@ uid_cachename_hack (CamelStore *store)
 	gchar *encoded_url, *filename;
 	const gchar *data_dir;
 
-	encoded_url = g_strdup_printf ("%s%s%s %s", url->user,
-				       url->authmech ? ";auth=" : "",
-				       url->authmech ? url->authmech : "",
-				       url->host);
+	if (!url->port)
+		encoded_url = g_strdup_printf ("%s%s%s %s", url->user,
+					       url->authmech ? ";auth=" : "",
+					       url->authmech ? url->authmech : "",
+					       url->host);
+	else
+		encoded_url = g_strdup_printf ("%s%s%s %s:%d", url->user,
+					       url->authmech ? ";auth=" : "",
+					       url->authmech ? url->authmech : "",
+					       url->host, url->port);
+		
 	e_filename_make_safe (encoded_url);
 
 	data_dir = mail_session_get_data_dir ();