[evolution-patches] e-d-s patch for groupwise and local camel providers

[Gary Ekker <gekker novell com>]

This patch is in autobuild for SuSE 9.3, and applies to e-d-s-1.1.4.2.

I think it needs to be upstreamed. If anyone ambitious feels like
committing it, that would be great, otherwise, if approved I'll commit
along with a ChangeLog.

-Gary

diff -pruN -x '*~' evolution-data-server-1.1.4.2-orig/camel/providers/groupwise/camel-groupwise-store-summary.c evolution-data-server-1.1.4.2/camel/providers/groupwise/camel-groupwise-store-summary.c
--- evolution-data-server-1.1.4.2-orig/camel/providers/groupwise/camel-groupwise-store-summary.c	Mon Jan 10 12:38:23 2005
+++ evolution-data-server-1.1.4.2/camel/providers/groupwise/camel-groupwise-store-summary.c	Sat Feb  5 20:22:41 2005
@@ -429,11 +429,11 @@ camel_groupwise_store_summary_namespace_
 	return ns;
 }
 
+static void namespace_clear(CamelStoreSummary *s);
+
 void 
 camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s, CamelGroupwiseStoreNamespace *ns)
 {
-	static void namespace_clear(CamelStoreSummary *s);
-
 	d(printf("Setting namesapce to '%s' '%c' -> '%s'\n", ns->full_name, ns->sep, ns->path));
 	namespace_clear((CamelStoreSummary *)s);
 	s->namespace = ns;
diff -pruN -x '*~' evolution-data-server-1.1.4.2-orig/camel/providers/local/camel-local-store.c evolution-data-server-1.1.4.2/camel/providers/local/camel-local-store.c
--- evolution-data-server-1.1.4.2-orig/camel/providers/local/camel-local-store.c	Mon Sep 20 07:59:54 2004
+++ evolution-data-server-1.1.4.2/camel/providers/local/camel-local-store.c	Sat Feb  5 20:24:55 2005
@@ -293,8 +293,8 @@ create_folder(CamelStore *store, const c
 static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, int missingok, CamelException *ex)
 {
 	struct stat st;
-	char *old = g_strconcat(prefix, oldp, suffix, 0);
-	char *new = g_strconcat(prefix, newp, suffix, 0);
+	char *old = g_strconcat(prefix, oldp, suffix, NULL);
+	char *new = g_strconcat(prefix, newp, suffix, NULL);
 	int ret = -1;
 	int err = 0;
 
diff -pruN -x '*~' evolution-data-server-1.1.4.2-orig/servers/groupwise/e-gw-connection.c evolution-data-server-1.1.4.2/servers/groupwise/e-gw-connection.c
--- evolution-data-server-1.1.4.2-orig/servers/groupwise/e-gw-connection.c	Mon Jan 24 17:16:55 2005
+++ evolution-data-server-1.1.4.2/servers/groupwise/e-gw-connection.c	Sat Feb  5 20:17:02 2005
@@ -425,7 +425,7 @@ e_gw_connection_new (const char *uri, co
 		port = soup_soap_parameter_get_string_value (subparam);
 		if (host && port) {
 			tokens = g_strsplit (uri, "://", 2);
-			redirected_uri = g_strconcat (tokens[0], "://", host, ":", port, "/soap");
+			redirected_uri = g_strconcat (tokens[0], "://", host, ":", port, "/soap", NULL);
 			g_object_unref (msg);
 			g_object_unref (response);
 			msg = form_login_request (redirected_uri, username, password);