[evolution-kolab] libekolabutil: do not prepend cache directory with protocol prefix when not in fallback mode
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] libekolabutil: do not prepend cache directory with protocol prefix when not in fallback mode
- Date: Wed, 29 Aug 2012 10:31:58 +0000 (UTC)
commit a202da1ec7d500f2a4c619a5c0732d01c02fc63e
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Wed Aug 29 12:28:55 2012 +0200
libekolabutil: do not prepend cache directory with protocol prefix when not in fallback mode
* if we get an ESource with UID set, this is the cache directory
name to use (must match, otherwise the cache reaper will kill
the directory since the name does not match one of the configured
ESources)
* we only use the "kolab__<user>@<host>" scheme for cache directory
names when we do not have an ESource (which is true for the
test-kolab-mail-access integration testcase)
src/libekolab/kolab-util-backend.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index 2cdf145..dce3cf4 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -446,7 +446,7 @@ kolab_util_backend_account_uid_new_from_settings (KolabSettingsHandler *ksetting
}
if (esource_uid != NULL) {
- tmp_str = g_strdup (esource_uid);
+ account_uid = g_strdup (esource_uid);
goto done;
}
@@ -460,11 +460,11 @@ kolab_util_backend_account_uid_new_from_settings (KolabSettingsHandler *ksetting
tmp_str = g_strconcat (user, "@", host, NULL);
- done:
-
account_uid = g_strconcat (KOLAB_CAMEL_PROVIDER_PROTOCOL, "__", tmp_str, NULL);
g_free (tmp_str);
+ done:
+
return account_uid;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]