[evolution-kolab: 140/140] Merge branch 'ek-wip-porting'
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab: 140/140] Merge branch 'ek-wip-porting'
- Date: Tue, 24 Jan 2012 10:53:29 +0000 (UTC)
commit cf911b497f2de4f96ba7630bb46eb89d4a0e3174
Merge: abcd61d b520b3c
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Tue Jan 24 11:23:04 2012 +0100
Merge branch 'ek-wip-porting'
.gitignore | 4 +
Doxyfile | 2 +-
configure.ac | 10 +-
po/POTFILES.in | 7 +-
src/addressbook/e-book-backend-kolab-factory.c | 113 +-
src/addressbook/e-book-backend-kolab.c | 1267 +++--
src/addressbook/e-book-backend-kolab.h | 106 +-
src/addressbook/kolab-util-contact-cache.c | 163 +-
src/addressbook/kolab-util-contact-cache.h | 120 +-
src/addressbook/kolab-util-contact.c | 144 +-
src/addressbook/kolab-util-contact.h | 76 +-
src/calendar/Makefile.am | 3 +-
src/calendar/e-cal-backend-kolab-factory.c | 123 +-
src/calendar/e-cal-backend-kolab.c | 1852 ++++---
src/calendar/e-cal-backend-kolab.h | 22 +-
src/calendar/kolab-util-calendar-cache.c | 233 +-
src/calendar/kolab-util-calendar-cache.h | 136 +-
src/calendar/kolab-util-calendar.c | 572 +-
src/calendar/kolab-util-calendar.h | 101 +-
src/camel/Makefile.am | 102 +-
src/camel/camel-kolab-imapx-conn-manager.c | 202 +
src/camel/camel-kolab-imapx-conn-manager.h | 88 +
src/camel/camel-kolab-imapx-folder.c | 223 +-
src/camel/camel-kolab-imapx-folder.h | 82 +-
src/camel/camel-kolab-imapx-metadata-db.c | 364 +-
src/camel/camel-kolab-imapx-metadata-db.h | 71 +-
src/camel/camel-kolab-imapx-metadata.c | 607 +--
src/camel/camel-kolab-imapx-metadata.h | 55 +-
src/camel/camel-kolab-imapx-provider.c | 151 +-
src/camel/camel-kolab-imapx-provider.h | 6 +-
src/camel/camel-kolab-imapx-server.c | 492 ++
src/camel/camel-kolab-imapx-server.h | 133 +
src/camel/camel-kolab-imapx-settings.c | 98 +
src/camel/camel-kolab-imapx-settings.h | 83 +
src/camel/camel-kolab-imapx-store.c | 1050 ++++-
src/camel/camel-kolab-imapx-store.h | 110 +-
src/camel/camel-kolab-imapx-transport.c | 41 -
src/camel/camel-kolab-imapx-transport.h | 67 -
src/camel/camel-kolab-provider.c | 136 -
src/camel/camel-kolab-provider.h | 43 -
src/camel/camel-kolab-session.c | 359 +-
src/camel/camel-kolab-session.h | 118 +-
src/camel/camel-kolab-stream.c | 64 +-
src/camel/camel-kolab-stream.h | 21 +-
src/camel/camel-private.h | 208 -
src/camel/providers/README | 8 +-
src/camel/providers/VERSIONS | 4 +-
src/camel/providers/imapx/ChangeLog | 77 -
src/camel/providers/imapx/Makefile.am | 143 +-
.../imapx/camel-imapx-conn-manager-defs.h | 69 +
.../imapx/camel-imapx-conn-manager-friend.h} | 51 +-
.../providers/imapx/camel-imapx-conn-manager.c | 535 ++
.../providers/imapx/camel-imapx-conn-manager.h | 78 +
src/camel/providers/imapx/camel-imapx-exception.c | 116 -
src/camel/providers/imapx/camel-imapx-exception.h | 71 -
.../imapx/camel-imapx-extd-conn-manager.c | 501 ++
.../imapx/camel-imapx-extd-conn-manager.h | 124 +
.../providers/imapx/camel-imapx-extd-folder.c | 474 ++
.../providers/imapx/camel-imapx-extd-folder.h | 96 +
.../providers/imapx/camel-imapx-extd-server.c | 2213 +++++++
.../providers/imapx/camel-imapx-extd-server.h | 312 +
src/camel/providers/imapx/camel-imapx-extd-store.c | 776 +++
src/camel/providers/imapx/camel-imapx-extd-store.h | 102 +
.../providers/imapx/camel-imapx-extd-tokens.txt | 50 +
src/camel/providers/imapx/camel-imapx-folder.c | 773 ++--
src/camel/providers/imapx/camel-imapx-folder.h | 91 +-
src/camel/providers/imapx/camel-imapx-metadata.c | 563 +-
src/camel/providers/imapx/camel-imapx-metadata.h | 133 +-
src/camel/providers/imapx/camel-imapx-provider.c | 116 +-
.../providers/imapx/camel-imapx-server-defs.h | 249 +
.../providers/imapx/camel-imapx-server-friend.h | 127 +
src/camel/providers/imapx/camel-imapx-server.c | 6075 +++++++++++---------
src/camel/providers/imapx/camel-imapx-server.h | 238 +-
src/camel/providers/imapx/camel-imapx-settings.c | 1266 ++++
src/camel/providers/imapx/camel-imapx-settings.h | 136 +
.../providers/imapx/camel-imapx-store-summary.c | 400 +-
.../providers/imapx/camel-imapx-store-summary.h | 118 +-
src/camel/providers/imapx/camel-imapx-store.c | 1844 ++++---
src/camel/providers/imapx/camel-imapx-store.h | 108 +-
src/camel/providers/imapx/camel-imapx-stream.c | 559 ++-
src/camel/providers/imapx/camel-imapx-stream.h | 136 +-
src/camel/providers/imapx/camel-imapx-summary.c | 449 +-
src/camel/providers/imapx/camel-imapx-summary.h | 97 +-
src/camel/providers/imapx/camel-imapx-tokens.txt | 6 +-
src/camel/providers/imapx/camel-imapx-utils.c | 1591 +++---
src/camel/providers/imapx/camel-imapx-utils.h | 186 +-
.../providers/imapx/camel-imapx-view-summary.c | 162 -
.../providers/imapx/camel-imapx-view-summary.h | 63 -
src/camel/providers/imapx/test-imapx.c | 73 +-
src/eplugin/kolab-account-setup.c | 303 +-
src/eplugin/kolab-account-setup.h | 19 +-
src/libekolab/Makefile.am | 3 +
src/libekolab/kolab-folder-summary.c | 17 +-
src/libekolab/kolab-folder-summary.h | 7 +-
src/libekolab/kolab-mail-access.c | 472 +-
src/libekolab/kolab-mail-access.h | 130 +-
src/libekolab/kolab-mail-handle.c | 480 +-
src/libekolab/kolab-mail-imap-client.c | 690 ++-
src/libekolab/kolab-mail-imap-client.h | 127 +-
src/libekolab/kolab-mail-info-db-record.c | 27 +-
src/libekolab/kolab-mail-info-db-record.h | 54 +-
src/libekolab/kolab-mail-info-db.c | 317 +-
src/libekolab/kolab-mail-mime-builder.c | 124 +-
src/libekolab/kolab-mail-mime-builder.h | 52 +-
src/libekolab/kolab-mail-side-cache.c | 102 +-
src/libekolab/kolab-mail-summary.c | 111 +-
src/libekolab/kolab-mail-summary.h | 9 +-
src/libekolab/kolab-mail-synchronizer.c | 884 ++--
src/libekolab/kolab-mail-synchronizer.h | 121 +-
src/libekolab/kolab-settings-handler.c | 132 +-
src/libekolab/kolab-types.h | 13 +-
src/libekolab/kolab-util-backend.c | 130 +-
src/libekolab/kolab-util-backend.h | 8 +-
src/libekolabconv/main/src/evolution/Makefile.am | 65 +-
.../main/src/evolution/contact-e-to-i.c | 17 +-
.../main/src/evolution/contact-i-to-e.c | 11 +-
.../main/src/evolution/event-e-to-i.c | 3 +-
.../main/src/evolution/event-i-to-e.c | 3 +-
.../main/src/evolution/evolution-util.c | 3 +-
.../main/src/evolution/evolution-util.h | 1 +
src/libekolabconv/main/src/evolution/evolution.h | 1 +
src/libekolabconv/main/src/evolution/note-e-to-i.c | 3 +-
src/libekolabconv/main/src/evolution/note-i-to-e.c | 3 +-
.../main/src/evolution/priv-common-e-to-i.c | 9 +-
.../main/src/evolution/priv-common-i-to-e.c | 5 +-
.../main/src/evolution/priv-evolution-preserve.c | 7 +-
.../main/src/evolution/priv-evolution.h | 1 +
.../main/src/evolution/priv-incidence-e-to-i.c | 7 +-
.../main/src/evolution/priv-incidence-i-to-e.c | 5 +-
src/libekolabconv/main/src/evolution/task-e-to-i.c | 5 +-
src/libekolabconv/main/src/evolution/task-i-to-e.c | 3 +-
src/libekolabconv/main/src/kolab-conv.c | 17 +-
src/libekolabconv/main/src/kolab-conv.h | 1 +
src/libekolabconv/main/src/kolab/Makefile.am | 67 +-
src/libekolabconv/main/src/kolab/contact-i-to-k.c | 1 +
src/libekolabconv/main/src/kolab/contact-k-to-i.c | 13 +-
src/libekolabconv/main/src/kolab/event-i-to-k.c | 1 +
src/libekolabconv/main/src/kolab/event-k-to-i.c | 5 +-
src/libekolabconv/main/src/kolab/kolab-constants.h | 1 +
src/libekolabconv/main/src/kolab/kolab-util.c | 13 +-
src/libekolabconv/main/src/kolab/kolab-util.h | 1 +
src/libekolabconv/main/src/kolab/kolab.h | 1 +
src/libekolabconv/main/src/kolab/note-i-to-k.c | 1 +
src/libekolabconv/main/src/kolab/note-k-to-i.c | 3 +-
.../main/src/kolab/priv-common-i-to-k.c | 3 +-
.../main/src/kolab/priv-common-k-to-i.c | 7 +-
.../main/src/kolab/priv-incidence-i-to-k.c | 3 +-
.../main/src/kolab/priv-incidence-k-to-i.c | 11 +-
.../main/src/kolab/priv-kolab-preserve.c | 5 +-
src/libekolabconv/main/src/kolab/priv-kolab.h | 1 +
src/libekolabconv/main/src/kolab/task-i-to-k.c | 3 +-
src/libekolabconv/main/src/kolab/task-k-to-i.c | 7 +-
src/libekolabconv/main/src/logging.c | 1 +
src/libekolabconv/main/src/logging.h | 1 +
src/libekolabconv/main/src/structs/Makefile.am | 55 +-
src/libekolabconv/main/src/structs/common.c | 11 +-
src/libekolabconv/main/src/structs/common.h | 5 +-
src/libekolabconv/main/src/structs/contact.c | 1 +
src/libekolabconv/main/src/structs/contact.h | 1 +
src/libekolabconv/main/src/structs/event.c | 1 +
src/libekolabconv/main/src/structs/event.h | 1 +
src/libekolabconv/main/src/structs/incidence.c | 3 +-
src/libekolabconv/main/src/structs/incidence.h | 1 +
src/libekolabconv/main/src/structs/note.c | 1 +
src/libekolabconv/main/src/structs/note.h | 1 +
src/libekolabconv/main/src/structs/task.c | 1 +
src/libekolabconv/main/src/structs/task.h | 1 +
src/libekolabconv/main/src/util.c | 1 +
src/libekolabconv/main/src/util.h | 1 +
src/libekolabconv/test/src/Makefile.am | 3 +
src/libekolabconv/test/src/email-parser.c | 5 +-
src/libekolabconv/test/src/email-parser.h | 1 +
src/libekolabconv/test/src/main.c | 7 +-
src/libekolabconv/test/src/main.h | 1 +
src/libekolabconv/test/src/test-convert-setup.h | 1 +
.../test/src/test-evolution-contact.c | 1 +
src/libekolabconv/test/src/test-evolution-event.c | 7 +-
src/libekolabconv/test/src/test-evolution-note.c | 1 +
src/libekolabconv/test/src/test-evolution-task.c | 3 +-
src/libekolabconv/test/src/test-kolab-contact.c | 7 +-
src/libekolabconv/test/src/test-kolab-event.c | 15 +-
src/libekolabconv/test/src/test-kolab-note.c | 1 +
src/libekolabconv/test/src/test-kolab-task.c | 15 +-
src/libekolabconv/test/src/test-util.c | 17 +-
src/libekolabconv/test/src/test-util.h | 1 +
src/libekolabconv/test/src/testbase.c | 9 +-
src/libekolabconv/test/src/testbase.h | 1 +
src/libekolabutil/camel-system-headers.h | 10 +-
src/libekolabutil/kolab-util-cal-freebusy.c | 21 +-
src/libekolabutil/kolab-util-camel.c | 44 +-
src/libekolabutil/kolab-util-camel.h | 7 +-
src/libekolabutil/kolab-util-error.c | 65 +-
src/libekolabutil/kolab-util-error.h | 34 +-
src/libekolabutil/kolab-util-folder.c | 118 +-
src/libekolabutil/kolab-util-folder.h | 26 +-
src/libekolabutil/kolab-util-glib.c | 17 +-
src/libekolabutil/kolab-util-glib.h | 7 +-
src/libekolabutil/kolab-util-http.c | 50 +-
src/libekolabutil/kolab-util-kconv.c | 17 +-
src/libekolabutil/kolab-util-kconv.h | 7 +-
src/libekolabutil/kolab-util-sqlite.c | 51 +-
src/libekolabutil/kolab-util-sqlite.h | 7 +-
src/libekolabutil/kolab-util-types.h | 7 +-
.../test-camel-kolab-imapx-provider.c | 15 +-
src/tests/integration/libekolab/Makefile.am | 16 +-
.../integration/libekolab/test-kolab-mail-access.c | 81 +-
.../libekolab/test-kolab-util-cal-freebusy.c | 67 +-
.../integration/libekolab/test-kolab-util-http.c | 52 +-
.../integration/libekolab/test-kolab-util-ldap.c | 21 +-
209 files changed, 23851 insertions(+), 13108 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]