evolution r36850 - trunk/plugins/caldav

[mcrha svn gnome org]

Author: mcrha
Date: Mon Dec  8 11:05:08 2008
New Revision: 36850
URL: http://svn.gnome.org/viewvc/evolution?rev=36850&view=rev

Log:
2008-12-08  Milan Crha  <mcrha redhat com>

	** Fix for bug #562990

	* caldav-source.c: (user_changed), (oge_caldav): Use 'username'
	property of the ESource to read/write user name, not the uri.



Modified:
   trunk/plugins/caldav/ChangeLog
   trunk/plugins/caldav/caldav-source.c

Modified: trunk/plugins/caldav/caldav-source.c
==============================================================================
--- trunk/plugins/caldav/caldav-source.c	(original)
+++ trunk/plugins/caldav/caldav-source.c	Mon Dec  8 11:05:08 2008
@@ -190,16 +190,15 @@
 
 	euri = e_uri_new (uri);
 	g_free (euri->user);
+	euri->user = NULL;
 
 	if (user != NULL && *user) {
-		euri->user = g_strdup (user);
 		e_source_set_property (source, "auth", "1");
 	} else {
 		e_source_set_property (source, "auth", NULL);
-		euri->user = NULL;
 	}
 
-	e_source_set_property (source, "username", euri->user);
+	e_source_set_property (source, "username", user);
 	ruri = print_uri_noproto (euri);
 	e_source_set_relative_uri (source, ruri);
 	g_free (ruri);
@@ -328,10 +327,12 @@
 		return NULL;
 	}
 
-	username = euri->user;
+	g_free (euri->user);
 	euri->user = NULL;
 	uri = e_uri_to_string (euri, FALSE);
 
+	username = e_source_get_duped_property (source, "username");
+
 	ssl_prop = e_source_get_property (source, "ssl");
 	if (ssl_prop && ssl_prop[0] == '1') {
 		ssl_enabled = TRUE;