Index: evolution-data-server/servers/exchange/storage/exchange-esource.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-esource.c,v
retrieving revision 1.9
diff -u -p -r1.9 exchange-esource.c
--- evolution-data-server/servers/exchange/storage/exchange-esource.c	14 Jan 2006 12:02:14 -0000	1.9
+++ evolution-data-server/servers/exchange/storage/exchange-esource.c	2 Feb 2006 06:05:08 -0000
@@ -45,7 +45,7 @@ add_folder_esource (ExchangeAccount *acc
 	GConfClient *client;
 	gboolean is_contacts_folder = TRUE, group_new = FALSE, source_new = FALSE;
 	const char *offline = NULL;
-	char *username, *authtype;
+	char *username, *authtype = NULL;
 	int mode;
 	ESourceList *source_list = NULL;
 	gboolean offline_flag;
@@ -187,6 +187,7 @@ add_folder_esource (ExchangeAccount *acc
 	}
 
 	g_free (relative_uri);
+	g_free (authtype);
 
 	if (source_new) 
 		g_object_unref (source);
Index: evolution-exchange/storage/exchange-config-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-config-listener.c,v
retrieving revision 1.31
diff -u -p -r1.31 exchange-config-listener.c
--- evolution-exchange/storage/exchange-config-listener.c	28 Sep 2005 13:46:01 -0000	1.31
+++ evolution-exchange/storage/exchange-config-listener.c	2 Feb 2006 06:06:49 -0000
@@ -281,6 +281,7 @@ ex_set_relative_uri (ESource *source, co
 
 	new_rel_uri = g_strdup_printf ("%s;%s", url, folder_name + 1);
 	e_source_set_relative_uri (source, new_rel_uri);
+	g_free (new_rel_uri);
 }
 
 static void 
@@ -305,8 +306,11 @@ migrate_account_esource (EAccount *accou
 	authtype  = camel_url->authmech;
 	url_string = camel_url_to_string (camel_url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
 
-	if (!user_name) 
+	if (!user_name) {
+		g_free (url_string);
+		camel_url_free (camel_url);
 		return;
+	}
 
 	client = gconf_client_get_default ();
 
@@ -348,6 +352,8 @@ migrate_account_esource (EAccount *accou
 			}
 		}
 	}
+	g_free (url_string);
+	camel_url_free (camel_url);
 	g_object_unref (source_list);
 	g_object_unref (client);
 }
@@ -681,14 +687,14 @@ exchange_camel_urls_is_equal (const gcha
 		    (param1 && param2 && strcmp (param1, param2))) { /* Differing */
 			g_free (param1);
 			g_free (param2);
-			g_free (curl1);
-			g_free (curl2);
+			camel_url_free (curl1);
+			camel_url_free (curl2);
 			return FALSE;
 		}		
 		g_free (param1);
 		g_free (param2);
 	}
-	g_free (curl1);
-	g_free (curl2);
+	camel_url_free (curl1);
+	camel_url_free (curl2);
 	return TRUE;
 }
