[evolution-kolab: 19/19] Merge branch 'ek-wip-porting'
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab: 19/19] Merge branch 'ek-wip-porting'
- Date: Sat, 10 Mar 2012 19:30:00 +0000 (UTC)
commit 3438feffc40565ff5f86a71bc34cdf63c8ddc31a
Merge: 797feb8 a5d5099
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Sat Mar 10 20:29:18 2012 +0100
Merge branch 'ek-wip-porting'
src/camel/camel-kolab-imapx-conn-manager.c | 14 +-
src/camel/camel-kolab-imapx-metadata.c | 4 +
src/camel/camel-kolab-imapx-server.c | 168 +++++++----
src/camel/camel-kolab-imapx-server.h | 21 +--
src/camel/camel-kolab-imapx-store.c | 163 +++++++++--
src/camel/camel-kolab-imapx-store.h | 1 -
.../providers/imapx/camel-imapx-conn-manager.c | 30 ++-
.../providers/imapx/camel-imapx-conn-manager.h | 5 +
.../imapx/camel-imapx-extd-conn-manager.c | 23 +--
.../imapx/camel-imapx-extd-conn-manager.h | 11 -
.../providers/imapx/camel-imapx-extd-server.c | 320 +++++++++++++++-----
.../providers/imapx/camel-imapx-extd-server.h | 4 +
src/camel/providers/imapx/camel-imapx-extd-store.c | 10 +-
.../providers/imapx/camel-imapx-server-friend.h | 6 +
src/camel/providers/imapx/camel-imapx-server.c | 17 +
src/camel/providers/imapx/camel-imapx-utils.c | 1 +
src/camel/providers/imapx/camel-imapx-utils.h | 1 +
src/libekolab/kolab-settings-handler.c | 5 +-
src/libekolabutil/kolab-util-camel.c | 40 +---
19 files changed, 577 insertions(+), 267 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]