[evolution-data-server/camel-socks-proxy: 87/94] Merge remote branch 'origin/gnome-2-30' into camel-socks-proxy

[Federico Mena Quintero <federico src gnome org>]

commit 04312ea07b7b1dc1d3f0baee11b1f2453a3c9fc7
Merge: ee8fdcc 1ca0f0d
Author: Federico Mena Quintero <federico novell com>
Date:   Wed Jul 7 15:30:13 2010 -0500

    Merge remote branch 'origin/gnome-2-30' into camel-socks-proxy

 NEWS                                               |   83 ++
 addressbook/libebook/Makefile.am                   |    2 +-
 addressbook/libebook/e-book.c                      |   24 +-
 addressbook/libebook/e-contact.c                   |    6 +-
 addressbook/libebook/e-destination.c               |    8 +-
 .../groupwise/e-cal-backend-groupwise-utils.c      |   12 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |   18 +-
 calendar/libecal/e-cal-system-timezone.c           |   14 +-
 calendar/libedata-cal/Makefile.am                  |    1 +
 calendar/libedata-cal/e-data-cal-factory.c         |    5 +
 calendar/tests/ecal/Makefile.am                    |    2 +-
 calendar/tests/ecal/test-ecal.c                    |    2 +-
 camel/Makefile.am                                  |    8 +-
 camel/camel-block-file.c                           |   69 +-
 camel/camel-block-file.h                           |   10 +
 camel/camel-db.c                                   |    4 +-
 camel/camel-db.h                                   |   48 +-
 camel/camel-folder-summary.c                       |   47 +-
 camel/camel-folder-summary.h                       |    3 +
 camel/camel-gpg-context.c                          |    2 +-
 camel/camel-mime-part.c                            |    2 +-
 camel/camel-offline-folder.c                       |    4 +-
 camel/camel-partition-table.c                      |   36 +-
 camel/camel-partition-table.h                      |   10 +
 camel/camel-private.h                              |   14 +-
 camel/camel-sasl-gssapi.c                          |    8 +-
 camel/camel-stream-process.h                       |    4 +-
 camel/camel-stream-vfs.h                           |    6 +-
 camel/camel-win32.c                                |    2 +-
 camel/camel.c                                      |  107 ++-
 camel/providers/groupwise/camel-groupwise-folder.c |    5 -
 camel/providers/imapx/camel-imapx-folder.c         |   16 +-
 camel/providers/imapx/camel-imapx-folder.h         |    6 +-
 camel/providers/imapx/camel-imapx-provider.c       |   10 +-
 camel/providers/imapx/camel-imapx-server.c         | 1154 ++++++++++++++-----
 camel/providers/imapx/camel-imapx-server.h         |    8 +-
 camel/providers/imapx/camel-imapx-store-summary.c  |   74 +-
 camel/providers/imapx/camel-imapx-store.c          |  109 +-
 camel/providers/imapx/camel-imapx-store.h          |    4 +-
 camel/providers/imapx/camel-imapx-stream.c         |   10 +-
 camel/providers/imapx/camel-imapx-stream.h         |    3 +-
 camel/providers/imapx/camel-imapx-summary.h        |    2 +
 camel/providers/imapx/camel-imapx-tokenise.h       |  189 ----
 camel/providers/imapx/camel-imapx-tokens.txt       |    5 +
 camel/providers/imapx/camel-imapx-utils.c          |  119 ++-
 camel/providers/imapx/camel-imapx-utils.h          |   41 +-
 camel/providers/imapx/camel-imapx-view-summary.c   |    5 +-
 camel/providers/imapx/camel-imapx-view-summary.h   |    2 +-
 camel/providers/local/camel-mbox-summary.c         |   19 +-
 camel/providers/local/camel-mbox-summary.h         |    2 +-
 configure.ac                                       |    4 +-
 .../calendar/libecal/libecal-sections.txt          |    6 +
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    2 +
 .../libecal/tmpl/e-cal-system-timezone.sgml        |   42 +
 docs/reference/camel/camel-sections.txt            |   14 +-
 .../reference/camel/tmpl/camel-cipher-context.sgml |    8 +
 .../reference/camel/tmpl/camel-folder-summary.sgml |   16 +
 docs/reference/camel/tmpl/camel-imap-store.sgml    |   12 +
 docs/reference/camel/tmpl/camel-store.sgml         |    7 +
 libedataserver/Makefile.am                         |    2 +-
 libedataserver/e-categories.c                      |  189 ++--
 libedataserver/e-data-server-util.c                |    2 +-
 libedataserverui/e-name-selector-dialog.c          |    5 +-
 libedataserverui/e-passwords.c                     |    2 +-
 po/et.po                                           |   18 +-
 65 files changed, 1781 insertions(+), 892 deletions(-)
---