[evolution-kolab: 10/10] Merge branch 'ek-wip-porting'

[Christian Hilberg <chilberg src gnome org>]

commit 556eae813033c474ba0bc14206bd1b9bb4b49274
Merge: dcd2742 22659e5
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Mar 5 16:00:53 2012 +0100

    Merge branch 'ek-wip-porting'

 po/POTFILES.in                                     |   22 ++++++
 src/camel/camel-kolab-imapx-metadata-db.c          |   37 +++++-----
 src/camel/camel-kolab-imapx-metadata.c             |    7 +-
 src/camel/camel-kolab-session.c                    |    5 +-
 .../providers/imapx/camel-imapx-extd-folder.c      |    2 +-
 .../providers/imapx/camel-imapx-extd-server.c      |    2 +-
 src/camel/providers/imapx/camel-imapx-metadata.c   |   10 +--
 src/eplugin/e-kolab-plugin-ui.c                    |    2 +-
 src/libekolab/kolab-mail-access.c                  |   65 ++++++++---------
 src/libekolab/kolab-mail-handle.c                  |   56 ++++++++-------
 src/libekolab/kolab-mail-imap-client.c             |   76 ++++++++++----------
 src/libekolab/kolab-mail-info-db.c                 |   52 +++++++------
 src/libekolab/kolab-mail-mime-builder.c            |   23 +++---
 src/libekolab/kolab-mail-side-cache.c              |   41 ++++++-----
 src/libekolab/kolab-mail-synchronizer.c            |   30 ++++----
 src/libekolab/kolab-settings-handler.c             |   32 ++++----
 src/libekolab/kolab-util-backend.c                 |    3 +-
 src/libekolabconv/main/src/kolab-conv.c            |   12 ++-
 src/libekolabconv/main/src/kolab/contact-k-to-i.c  |   10 ++-
 src/libekolabconv/main/src/kolab/event-k-to-i.c    |   14 ++--
 src/libekolabconv/main/src/kolab/kolab-util.c      |   22 ++++---
 src/libekolabconv/main/src/kolab/note-k-to-i.c     |   10 ++-
 src/libekolabconv/main/src/kolab/task-k-to-i.c     |   10 ++-
 src/libekolabutil/kolab-util-camel.c               |   11 ++--
 src/libekolabutil/kolab-util-http.c                |   11 ++-
 src/libekolabutil/kolab-util-sqlite.c              |   35 +++++----
 26 files changed, 325 insertions(+), 275 deletions(-)
---