[evolution-kolab/gnome-3-4-0] Bug #673147 - Calendar/Addressbook not authenticating when built with libsoup 2.38

[Christian Hilberg <chilberg src gnome org>]

commit 721b065dd1e931dd323b9ba26ec7bfb8d2f69aa8
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Mar 30 12:47:21 2012 +0200

    Bug #673147 - Calendar/Addressbook not authenticating when built with libsoup 2.38
    
    * evolution-kolab used the string "kolab2" as an Evo/E-D-S-internal
      "base_uri" string, which has never been intended to be validated
      for URI schema conformance
    * Evo/E-D-S uses libsoup for internal URI handling. The URI schema
      validation has been made stricter in libsoup 2.38 than it was in
      2.36 and before. libsoup 2.38 does no longer create a SoupURI from
      a "kolab2://..." URI string
    * changed evolution-kolab "base_uri" from "kolab2" to "kolab"
      to fix this issue

 src/camel/libcamelkolab.urls         |    2 +-
 src/eplugin/e-kolab-account-setup.c  |    3 ++-
 src/libekolabutil/kolab-util-camel.h |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/libcamelkolab.urls b/src/camel/libcamelkolab.urls
index cd600bd..1f7fcee 100644
--- a/src/camel/libcamelkolab.urls
+++ b/src/camel/libcamelkolab.urls
@@ -1 +1 @@
-kolab2
+kolab
diff --git a/src/eplugin/e-kolab-account-setup.c b/src/eplugin/e-kolab-account-setup.c
index 4c5be1a..0fe1538 100644
--- a/src/eplugin/e-kolab-account-setup.c
+++ b/src/eplugin/e-kolab-account-setup.c
@@ -372,8 +372,9 @@ e_kolab_account_setup_backend_create (EPlugin *epl,
 
 	g_object_set_data (G_OBJECT (epl), KOLAB_EPLUGIN_WIDGET_NAME, NULL);
 
-	if (! e_plugin_util_is_group_proto (group, KOLAB_CAMEL_PROVIDER_NAME)) {
+	if (! e_plugin_util_is_group_proto (group, KOLAB_CAMEL_PROVIDER_PROTOCOL)) {
 		/* TODO: cleanup needed */
+		g_warning ("%s()[%u] Got wrong group protocol", __func__, __LINE__);
 		return NULL;
 	}
 
diff --git a/src/libekolabutil/kolab-util-camel.h b/src/libekolabutil/kolab-util-camel.h
index a2dec9c..8b66301 100644
--- a/src/libekolabutil/kolab-util-camel.h
+++ b/src/libekolabutil/kolab-util-camel.h
@@ -35,9 +35,9 @@
 
 /*----------------------------------------------------------------------------*/
 
-#define KOLAB_CAMEL_PROVIDER_PROTOCOL   "kolab2"
+#define KOLAB_CAMEL_PROVIDER_PROTOCOL   "kolab"
 #define KOLAB_CAMEL_PROVIDER_NAME       "Kolab2"
-#define KOLAB_CAMEL_URI_PREFIX          "kolab2://"
+#define KOLAB_CAMEL_URI_PREFIX          "kolab://"
 
 #define KOLAB_CAMELURL_DUMMY_URL           "protocol://user host domain tld/"
 #define KOLAB_CAMELURL_PARAM_SSL           "use_ssl"