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

[Christian Hilberg <chilberg src gnome org>]

commit deb627101080317bf0a7521519eb46e8be77f6a4
Merge: 4fe9493 621a777
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Mar 20 18:26:52 2012 +0100

    Merge branch 'ek-wip-porting'

 src/addressbook/Makefile.am                        |    8 +-
 src/addressbook/e-book-backend-kolab-factory.c     |    5 +-
 src/addressbook/e-book-backend-kolab.c             | 1292 ++++++----
 src/addressbook/kolab-util-contact.c               |  203 +-
 src/addressbook/kolab-util-contact.h               |   18 +-
 src/calendar/e-cal-backend-kolab-factory.c         |   19 +-
 src/calendar/e-cal-backend-kolab.c                 | 1800 ++++++++-----
 src/calendar/kolab-util-calendar-cache.c           |   70 +-
 src/calendar/kolab-util-calendar-cache.h           |    3 +
 src/calendar/kolab-util-calendar.c                 |  205 +-
 src/calendar/kolab-util-calendar.h                 |   13 +-
 src/camel/camel-kolab-imapx-folder.c               |    6 +-
 src/camel/camel-kolab-imapx-store.c                |    2 +-
 src/camel/camel-kolab-session.c                    |   37 +-
 src/camel/providers/VERSIONS                       |    2 +-
 .../imapx/camel-imapx-conn-manager-defs.h          |    8 +-
 .../providers/imapx/camel-imapx-extd-server.c      |    6 +-
 src/camel/providers/imapx/camel-imapx-server.c     |    6 +-
 src/eplugin/e-kolab-account-setup.c                |   47 +-
 src/eplugin/e-kolab-folder-permissions.c           |   15 +-
 src/eplugin/e-kolab-plugin-ui.c                    |    4 +-
 src/eplugin/e-kolab-plugin.c                       |    4 +-
 src/libekolab/kolab-mail-access.c                  |  568 +++--
 src/libekolab/kolab-mail-imap-client.c             |    9 +-
 src/libekolab/kolab-settings-handler.c             |    2 +
 src/libekolab/kolab-settings-handler.h             |    1 +
 src/libekolab/kolab-util-backend.c                 |  141 +-
 src/libekolab/kolab-util-backend.h                 |   23 +-
 .../main/src/evolution/contact-e-to-i.c            |   50 +-
 .../main/src/evolution/contact-i-to-e.c            |  123 +-
 .../main/src/evolution/event-e-to-i.c              |   14 +-
 .../main/src/evolution/event-i-to-e.c              |   21 +-
 .../main/src/evolution/priv-common-e-to-i.c        |   32 +-
 .../main/src/evolution/priv-common-i-to-e.c        |   23 +-
 .../main/src/evolution/priv-evolution-preserve.c   |    2 +-
 .../main/src/evolution/priv-incidence-e-to-i.c     |  159 +-
 .../main/src/evolution/priv-incidence-i-to-e.c     |  172 +-
 src/libekolabconv/main/src/evolution/task-e-to-i.c |   16 +-
 src/libekolabconv/main/src/evolution/task-i-to-e.c |   24 +-
 src/libekolabconv/main/src/kolab-conv.c            |   42 +-
 src/libekolabconv/main/src/kolab-conv.h            |    9 +-
 src/libekolabconv/main/src/kolab/contact-i-to-k.c  |  126 +-
 src/libekolabconv/main/src/kolab/contact-k-to-i.c  |   28 +-
 src/libekolabconv/main/src/kolab/event-i-to-k.c    |   28 +-
 src/libekolabconv/main/src/kolab/event-k-to-i.c    |    8 +-
 src/libekolabconv/main/src/kolab/kolab-util.c      |   64 +-
 .../main/src/kolab/priv-common-i-to-k.c            |  104 +-
 .../main/src/kolab/priv-incidence-i-to-k.c         |  227 +-
 .../main/src/kolab/priv-incidence-k-to-i.c         |   14 +-
 src/libekolabconv/main/src/kolab/task-i-to-k.c     |   24 +-
 src/libekolabconv/main/src/kolab/task-k-to-i.c     |   11 +-
 src/libekolabconv/main/src/logging.c               |    4 +-
 src/libekolabconv/main/src/structs/common.c        |   11 +-
 src/libekolabconv/main/src/structs/common.h        |   70 +-
 src/libekolabconv/main/src/structs/contact.c       |   10 +-
 src/libekolabconv/main/src/structs/contact.h       |    2 +-
 src/libekolabconv/main/src/structs/incidence.c     |   42 +-
 src/libekolabconv/main/src/structs/incidence.h     |    4 +-
 src/libekolabconv/main/src/util.c                  |    2 +-
 src/libekolabconv/test/src/Makefile.am             |   83 +-
 src/libekolabconv/test/src/email-parser.c          |   51 +-
 src/libekolabconv/test/src/main.c                  |   44 +-
 src/libekolabconv/test/src/test-convert-setup.h    |  372 ++--
 .../test/src/test-evolution-contact.c              |  163 +-
 src/libekolabconv/test/src/test-evolution-event.c  |  837 +++---
 src/libekolabconv/test/src/test-evolution-note.c   |   13 +-
 src/libekolabconv/test/src/test-evolution-task.c   |  510 ++--
 src/libekolabconv/test/src/test-kolab-contact.c    |  151 +-
 src/libekolabconv/test/src/test-kolab-event.c      | 2961 ++++++++++----------
 src/libekolabconv/test/src/test-kolab-note.c       |   17 +-
 src/libekolabconv/test/src/test-kolab-task.c       | 1861 ++++++------
 src/libekolabconv/test/src/test-util.c             |  247 +-
 src/libekolabconv/test/src/test-util.h             |   22 +-
 src/libekolabutil/kolab-util-camel.c               |    8 +-
 src/libekolabutil/kolab-util-error.c               |   37 +-
 src/libekolabutil/kolab-util-folder.c              |   40 +-
 src/libekolabutil/kolab-util-http.c                |   53 +-
 src/libekolabutil/kolab-util-http.h                |    1 +
 src/libekolabutil/kolab-util-kconv.c               |    2 +-
 src/libekolabutil/kolab-util-sqlite.c              |    4 +-
 .../libekolab/test-kolab-util-cal-freebusy.c       |    2 +-
 81 files changed, 7283 insertions(+), 6179 deletions(-)
---