commit 8a5ca7914728bca0ac20bee8fe761fed192351ab
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 12 18:28:55 2010 -0400

    NEWS update for 2.31.5 release.

 NEWS |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

commit d054b8c7640513bebef0aa022a979a232970a286
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 12 16:44:25 2010 +0200

    Bug #618938 - Crash when reading calendar acknowledgement message

 calendar/libecal/e-cal-component.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

commit 17941a9b9d6d4024505bc8c2a6601083e73edf66
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 12 16:16:32 2010 +0200

    Bug #623936 - 75 second delay when creating new DAV entries in Zimbra

 .../backends/webdav/e-book-backend-webdav.c        |   17 +++++++++--------
 calendar/backends/caldav/e-cal-backend-caldav.c    |    3 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

commit 18839bd419cb56986c32378ff980ed083c0565ac
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 12 07:59:20 2010 -0400

    Fix another g_propagate_error() runtime warning.

 camel/camel-folder.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d659ce98abc4832825c849913718d5edc84c4054
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Mon Jul 12 12:46:01 2010 +0100

    imapx: Ensure imapx_stream_fill() sets the error on zero-sized read.
    
    We treat an empty read as an error, since we should never be here unless
    we're either in the middle of reading a response, or poll() says the fd
    is readable. Before commit 46938c348 (the conversion to GError), we'd set
    a generic 'IO Error' exception in camel_imapx_stream_token() when
    imapx_stream_fill() returned -1 to indicate an error. But now we don't
    do that any more, so imapx_stream_fill() needs to reliably set the GError.
    
    Otherwise we end up in an endless loop in imapx_step().

 camel/providers/imapx/camel-imapx-stream.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 6d3b9dcbe6ddde71699dd9a29c9de6bc06c62b65
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 12 07:49:58 2010 -0400

    Fix runtime warning in camel_filter_driver_flush().
    
    Only propagate the error if there's an error to propagate.

 camel/camel-filter-driver.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e2ea5f1b668dcd88e581419b01d2d4d265460ddd
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 12 07:05:48 2010 -0400

    Improve error handling in CamelStreamBuffer::read().
    
    If we managed to successfully read some data before camel_stream_read()
    failed, discard the GError and return the number of bytes successfully
    read.  If camel_stream_read() failed immediately, propagate the GError
    and return -1.

 camel/camel-stream-buffer.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

commit 6108228eafb663803222d2dbc63f7f9303184fcd
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Mon Jul 12 04:11:38 2010 +0100

    imapx: camel_imapx_stream_astring() returns 0 on success.

 camel/providers/imapx/camel-imapx-utils.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 358eef57d8626f7f171a1b2b00ce25e3a02b1d85
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 11 22:19:33 2010 -0400

    Update API documentation.

 camel/camel-debug.h                                |    9 +-
 .../addressbook/libebook/libebook-sections.txt     |   24 ++
 .../addressbook/libebook/tmpl/e-book-types.sgml    |    7 +
 .../addressbook/libebook/tmpl/e-book.sgml          |  263 ++++++++++++++++++++
 .../addressbook/libedata-book/Makefile.am          |    1 +
 .../libedata-book/libedata-book-sections.txt       |    5 +-
 .../libedata-book/tmpl/e-data-book.sgml            |   39 +++
 .../calendar/libecal/libecal-sections.txt          |    2 +
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    3 +
 .../calendar/libecal/tmpl/e-cal-types.sgml         |    7 +
 .../calendar/libecal/tmpl/e-cal-view.sgml          |    8 +
 .../libedata-cal/libedata-cal-sections.txt         |    8 +-
 .../libedata-cal/tmpl/e-data-cal-view.sgml         |    9 +
 .../calendar/libedata-cal/tmpl/e-data-cal.sgml     |   39 +++
 docs/reference/camel/camel-sections.txt            |   13 +
 .../reference/camel/tmpl/camel-cipher-context.sgml |    4 +
 docs/reference/camel/tmpl/camel-debug.sgml         |   11 +
 docs/reference/camel/tmpl/camel-folder.sgml        |   21 ++
 docs/reference/camel/tmpl/camel-object.sgml        |   14 +
 docs/reference/camel/tmpl/camel-service.sgml       |   18 ++
 docs/reference/camel/tmpl/camel-store.sgml         |   15 ++
 .../libedataserverui/libedataserverui-sections.txt |    1 +
 .../libedataserverui/tmpl/e-book-auth-util.sgml    |   11 +
 23 files changed, 525 insertions(+), 7 deletions(-)

commit e6f5be9393e73cba92257c97563faa076bc597c9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 11 13:22:13 2010 -0400

    Coding style and whitespace cleanup.

 addressbook/backends/file/e-book-backend-file.c    |    6 +-
 .../backends/groupwise/e-book-backend-groupwise.c  |   10 ++--
 addressbook/backends/ldap/e-book-backend-ldap.c    |   68 ++++++++++----------
 addressbook/backends/ldap/openldap-extract.h       |   18 +++---
 addressbook/backends/vcf/e-book-backend-vcf.c      |    2 +-
 addressbook/libebook/e-book-query.c                |    8 +-
 addressbook/libebook/e-contact.c                   |    4 +-
 addressbook/libebook/e-name-western.c              |    4 +-
 addressbook/libebook/e-vcard.c                     |    6 +-
 addressbook/libedata-book/e-book-backend-sexp.c    |   10 ++--
 addressbook/libedata-book/e-book-backend-summary.c |    8 +-
 addressbook/tests/ebook/test-query.c               |    2 +-
 addressbook/tests/ebook/test-stress-bookviews.c    |    2 +-
 calendar/libedata-cal/e-cal-backend-sexp.c         |    2 +-
 camel/camel-folder-summary.c                       |    2 +-
 camel/camel-folder.c                               |    4 +-
 camel/camel-search-sql-sexp.c                      |    4 +-
 camel/providers/groupwise/camel-groupwise-folder.c |    8 +-
 camel/providers/imap/camel-imap-store-summary.c    |    2 +-
 camel/providers/nntp/camel-nntp-store.c            |    2 +-
 libedataserver/e-source-group.c                    |    4 +-
 libedataserver/e-source-list.c                     |    4 +-
 servers/groupwise/e-gw-connection.c                |    2 +-
 23 files changed, 91 insertions(+), 91 deletions(-)

commit 5de5afdb2bc2253578b3a6323dc36a97342aec89
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Sun Jul 11 18:36:33 2010 +0200

    [i18n] Updated German translation

 po/de.po |  670 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 406 insertions(+), 264 deletions(-)

commit e70b5d9e1a90b249e80e88585b7384b260896fff
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun Jul 11 17:44:10 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 2410 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1295 insertions(+), 1115 deletions(-)

commit 7355227d37b0ee9d5b67cac11391ff7e696625de
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 11 11:34:36 2010 -0400

    Coding style and whitespace cleanup.

 addressbook/backends/ldap/e-book-backend-ldap.c    |    1 -
 addressbook/libebook/e-book.c                      |   39 +++++++++++-----
 addressbook/libebook/e-error.h                     |   45 +++++++++---------
 calendar/libecal/e-cal.c                           |    2 +-
 camel/camel-lock-client.c                          |    2 +-
 camel/camel.c                                      |    7 +--
 camel/providers/imapx/camel-imapx-server.c         |   48 +++++++++----------
 camel/providers/imapx/camel-imapx-server.h         |    3 +-
 camel/providers/imapx/camel-imapx-utils.c          |    1 -
 camel/providers/imapx/camel-imapx-utils.h          |    2 +-
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    1 +
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 libedataserverui/e-name-selector.c                 |    1 -
 libedataserverui/gtk-compat.h                      |    2 +-
 14 files changed, 83 insertions(+), 73 deletions(-)

commit 1d1b146e58f918f67ccff93c4fb5388429bf12e7
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Jul 11 15:11:17 2010 +0100

    imapx: Avoid running FETCH_NEW_MESSAGES and REFRESH_INFO jobs simultaneously
    
    There are various places where we interpret FETCH results and use
    imapx_match_active_job to find the current job, which will behave badly
    if there are two jobs which could potentially be responsible for the FETCH.
    
    In particular, this was causing a problem when we triggered a fetch of new
    messages from select_done(), and that command was submitted at the same time
    as a refresh_info command to fetch all flags. The server (Dovecot) was
    returning all the untagged FETCH results before either completion line,
    and all the flags were getting "assigned" to the fetch_new_messages job,
    causing a bunch of 'g_array_append_vals: assertion `array' failed' warnings,
    and all messages to disappear because the refresh_info job didn't see them.

 camel/providers/imapx/camel-imapx-server.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

commit 5110089928fc9cfa3061b048719fbc67f2693c18
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun Jul 11 15:42:24 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

commit 436634e0ba281199788e7b6535f4c99b0d881ebd
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Jul 11 12:36:19 2010 +0100

    imapx: Fix handling of return from camel_imapx_stream_text()
    
    It's another of those functions that return 0 for success.

 camel/providers/imapx/camel-imapx-server.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 23503ac0c08fa8d933acb4be653257e596da6ae3
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Jul 11 12:17:13 2010 +0100

    imapx: More improvements to server unseen count tracking
    
    We're using the unseen count as part of our check for when things have
    changed on the server (or when QRESYNC has gone wrong), and we need to
    rescan all flags. But the server doesn't *tell* us about changes to the
    unseen count, like it does for the total count of messages. So we have to
    be more careful about tracking it -- especially since the server doesn't
    even tell us in SELECT, and we can't issue STATUS to find it out when the
    folder is selected.
    
    One place that it was getting out of sync was when the server notified us
    about new messages in SELECT, which weren't there when we last issued STATUS.
    For messages with a UID equal to or higher than what we thought was the
    folder's UIDNEXT, we also have to update the unseen count.
    
    So far, the _only_ time we've hit the QRESYNC sanity check which triggers
    a full rescan has been due to this kind of cosmetic unseen count discrepancy.
    It's half tempting to disable that check in the QRESYNC sanity check, but
    actually it's useful to get it right for the legacy servers too, because it
    might cause us to miss updates if we get out of sync.

 camel/providers/imapx/camel-imapx-server.c |   53 ++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 3 deletions(-)

commit ffcba2db913eeddded4b61d001d9b485a5e62b23
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Jul 11 11:56:32 2010 +0100

    nntp: Fix two more 'returns FALSE on error' vs. 'returns 0 on success' errors
    
    We really need to start being consistent about this.
    
    Pass the GError pointer through to camel_folder_summary_save_to_db()
    from nntp_folder_sync() too... although it seems to be NULL a lot of the
    time anyway, but that's the fault of our caller. No need to compound it.

 camel/providers/nntp/camel-nntp-folder.c |    3 +--
 camel/providers/nntp/camel-nntp-store.c  |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 20f6a2c17fbad0e15db0b583e3d6c21e260f761a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 10 23:30:06 2010 -0400

    Fix some linker issues.

 addressbook/libedata-book/Makefile.am              |    5 +-
 addressbook/tests/vcard/Makefile.am                |    1 +
 calendar/libedata-cal/Makefile.am                  |    7 +-
 calendar/tests/ecal/Makefile.am                    |   85 ++++++++++----------
 docs/reference/addressbook/libebook/Makefile.am    |    1 +
 .../addressbook/libebook/tmpl/e-book-types.sgml    |    3 +-
 .../addressbook/libebook/tmpl/e-book-view.sgml     |    9 ++
 .../addressbook/libedata-book/Makefile.am          |    1 +
 .../libedata-book/tmpl/e-book-backend-sync.sgml    |   28 +++----
 .../libedata-book/tmpl/e-book-backend.sgml         |    4 +-
 .../libedata-book/tmpl/e-data-book-view.sgml       |    3 +-
 .../libedata-book/tmpl/e-data-book.sgml            |   24 +++---
 .../libedata-book/tmpl/libedata-book-unused.sgml   |    6 ++
 docs/reference/calendar/libecal/Makefile.am        |    1 +
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    1 +
 .../calendar/libecal/tmpl/e-cal-types.sgml         |    3 +-
 .../calendar/libecal/tmpl/e-cal-view.sgml          |    9 ++
 docs/reference/calendar/libecal/tmpl/e-cal.sgml    |    8 ++
 docs/reference/calendar/libedata-cal/Makefile.am   |    1 +
 .../libedata-cal/tmpl/e-cal-backend-sync.sgml      |   54 ++++++-------
 .../libedata-cal/tmpl/e-cal-backend-util.sgml      |    9 --
 .../calendar/libedata-cal/tmpl/e-cal-backend.sgml  |   18 +----
 .../libedata-cal/tmpl/e-data-cal-view.sgml         |   11 +---
 .../calendar/libedata-cal/tmpl/e-data-cal.sgml     |   48 ++++++------
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 docs/reference/libedataserverui/Makefile.am        |    2 +
 26 files changed, 175 insertions(+), 169 deletions(-)

commit f98d7c4fbcff5de233828fb1fd7f2efe4683f13e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 10 08:16:15 2010 -0400

    Bug 624018 - Fix error handling in groupwise_get_folder()

 camel/providers/groupwise/camel-groupwise-store.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

commit e3f4979e67cb15148eb3ba9ef41620e595195772
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Jul 10 10:36:48 2010 +0200

    Updated Spanish translation

 po/es.po |  783 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 460 insertions(+), 323 deletions(-)

commit a57536cd01aba560f9cbad0f188c59cc67fb698a
Author: Bharath Acharya <abharath@novell.com>
Date:   Sat Jul 10 09:54:29 2010 +0530

    Bug #623988 - build failure in git/master.
    
    Add the marshal list and also a typo in weather.

 addressbook/libedata-book/e-data-book-marshal.list |    1 +
 calendar/backends/weather/e-cal-backend-weather.c  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit 8ac70847243f8d3d1485683e039dc86db3b26ae7
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 9 16:18:57 2010 +0200

    Update user documentation about E_CAL/BOOK_DISABLE_DEPRECATED

 addressbook/libebook/e-book.c                      |   10 ++++++++++
 calendar/libecal/e-cal.c                           |    8 ++++++++
 docs/reference/addressbook/libebook/Makefile.am    |    2 +-
 .../addressbook/libedata-book/Makefile.am          |    2 +-
 docs/reference/calendar/libecal/Makefile.am        |    2 +-
 docs/reference/calendar/libedata-cal/Makefile.am   |    2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)

commit 0dbb2c242ceca7de4055a75d8d592922190d56fa
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 9 13:18:42 2010 +0200

    Bug #623204 - Be able to report detailed errors from backends

 addressbook/backends/file/e-book-backend-file.c    |  225 +++--
 .../backends/google/e-book-backend-google.c        |  248 +++---
 .../backends/groupwise/e-book-backend-groupwise.c  |  228 +++---
 addressbook/backends/ldap/e-book-backend-ldap.c    |  383 ++++-----
 addressbook/backends/vcf/e-book-backend-vcf.c      |  103 +-
 .../backends/webdav/e-book-backend-webdav.c        |  180 ++--
 addressbook/libebook/e-book-marshal.list           |    1 +
 addressbook/libebook/e-book-types.h                |    9 +-
 addressbook/libebook/e-book-view.c                 |   54 +-
 addressbook/libebook/e-book-view.h                 |    3 +
 addressbook/libebook/e-book.c                      | 1013 ++++++++++++++++++--
 addressbook/libebook/e-book.h                      |  113 +++
 addressbook/libebook/e-error.h                     |   30 +
 addressbook/libedata-book/Makefile.am              |    8 +-
 addressbook/libedata-book/e-book-backend-sync.c    |  253 +++---
 addressbook/libedata-book/e-book-backend-sync.h    |   68 +-
 addressbook/libedata-book/e-book-backend.c         |   64 +-
 addressbook/libedata-book/e-book-backend.h         |   25 +-
 addressbook/libedata-book/e-data-book-types.h      |   39 +-
 addressbook/libedata-book/e-data-book-view.c       |   11 +-
 addressbook/libedata-book/e-data-book-view.h       |    2 +-
 addressbook/libedata-book/e-data-book-view.xml     |    1 +
 addressbook/libedata-book/e-data-book.c            |  212 ++++-
 addressbook/libedata-book/e-data-book.h            |   61 +-
 addressbook/tests/ebook/ebook-test-utils.c         |  108 +-
 addressbook/tests/ebook/test-ebook-async.c         |   24 +-
 addressbook/tests/ebook/test-ebook-get-book-view.c |    4 +-
 addressbook/tests/ebook/test-stress-bookviews.c    |    6 +-
 calendar/backends/caldav/e-cal-backend-caldav.c    |  586 ++++++------
 .../backends/contacts/e-cal-backend-contacts.c     |  187 ++--
 calendar/backends/file/e-cal-backend-file.c        |  371 ++++----
 calendar/backends/file/e-cal-backend-file.h        |    2 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |  510 ++++++-----
 calendar/backends/http/e-cal-backend-http.c        |  227 ++---
 calendar/backends/weather/e-cal-backend-weather.c  |  174 ++--
 calendar/libecal/e-cal-marshal.list                |    1 +
 calendar/libecal/e-cal-types.h                     |   10 +-
 calendar/libecal/e-cal-util.h                      |    6 +-
 calendar/libecal/e-cal-view.c                      |   75 ++-
 calendar/libecal/e-cal-view.h                      |    4 +
 calendar/libecal/e-cal.c                           |  187 +++-
 calendar/libecal/e-cal.h                           |    3 +
 calendar/libedata-cal/e-cal-backend-sync.c         |  575 +++++-------
 calendar/libedata-cal/e-cal-backend-sync.h         |  264 +++---
 calendar/libedata-cal/e-cal-backend-util.c         |   63 --
 calendar/libedata-cal/e-cal-backend-util.h         |    2 -
 calendar/libedata-cal/e-cal-backend.c              |   40 +-
 calendar/libedata-cal/e-cal-backend.h              |   10 +-
 calendar/libedata-cal/e-data-cal-factory.c         |    2 +-
 calendar/libedata-cal/e-data-cal-marshal.list      |    1 +
 calendar/libedata-cal/e-data-cal-types.h           |   49 +-
 calendar/libedata-cal/e-data-cal-view.c            |   79 +-
 calendar/libedata-cal/e-data-cal-view.h            |    4 +-
 calendar/libedata-cal/e-data-cal-view.xml          |    5 +
 calendar/libedata-cal/e-data-cal.c                 |  367 +++++---
 calendar/libedata-cal/e-data-cal.h                 |   85 ++-
 calendar/tests/ecal/ecal-test-utils.c              |   14 +-
 calendar/tests/ecal/test-ecal-get-query.c          |    8 +-
 calendar/tests/ecal/test-ecal.c                    |    8 +-
 configure.ac                                       |   12 +-
 libedataserverui/e-book-auth-util.c                |   85 ++-
 libedataserverui/e-book-auth-util.h                |    4 +
 libedataserverui/e-contact-store.c                 |    6 +-
 libedataserverui/e-name-selector-dialog.c          |   21 +-
 libedataserverui/e-name-selector-entry.c           |    2 +-
 libedataserverui/e-name-selector.c                 |    2 +-
 66 files changed, 4421 insertions(+), 3106 deletions(-)

commit 4bdfcb63aaee3256ba63f3354c8732483306fc03
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Fri Jul 9 12:40:40 2010 +0200

    [i18n] Updated German translation

 po/de.po | 2393 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 1025 insertions(+), 1368 deletions(-)

commit 5610539961fe1ba1c6b0f153c0c14cbb415fac0f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 9 06:30:35 2010 -0400

    Bug 623919 - Error while opening any newly received message

 camel/providers/groupwise/camel-groupwise-folder.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 035e8869fa12c04afb62202efa703eb3b87fa974
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 9 09:34:18 2010 +0200

    Use correct format specifier for 64bit unsigned int

 camel/providers/imapx/camel-imapx-server.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 3a76b8ec03ad56a74b551b0ffa66bb0e798c5d39
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 9 09:32:33 2010 +0200

    Do not use uninitialized variable

 calendar/libedata-cal/e-cal-backend-cache.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 6b3281bdd495206dec6c6e6b361fbfdbaa6dc560
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 8 18:12:01 2010 -0400

    Use the new base directory functions.
    
    Put an end to hard-coding "$HOME/.evolution".

 .../backends/groupwise/e-book-backend-groupwise.c  |   10 ++-
 addressbook/backends/ldap/e-book-backend-ldap.c    |    6 +-
 addressbook/libebook/e-book.c                      |    8 +-
 addressbook/libedata-book/e-book-backend-cache.c   |   23 ++---
 .../libedata-book/e-book-backend-db-cache.c        |   25 ++---
 calendar/backends/caldav/e-cal-backend-caldav.c    |   14 ++--
 calendar/backends/file/e-cal-backend-file.c        |    6 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |   32 +++----
 calendar/libecal/e-cal.c                           |  110 +++++++++----------
 calendar/libedata-cal/e-cal-backend-cache.c        |   22 ++---
 calendar/libedata-cal/e-cal-backend-store.c        |   21 ++--
 calendar/tests/ecal/test-ecal.c                    |   40 +++++--
 .../libedataserverui/tmpl/e-source-combo-box.sgml  |    1 +
 libedataserver/e-categories.c                      |    8 +-
 14 files changed, 162 insertions(+), 164 deletions(-)

commit 10a3ff80ce5025a4ea0b6ea81d1e7378f709b263
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Jul 8 23:41:18 2010 +0200

    Updated Spanish translation

 po/es.po | 1809 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 984 insertions(+), 825 deletions(-)

commit e60ee56f34745a885ab52ce1929b06cb0dbbbe4f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 8 16:23:58 2010 -0400

    Add functions to get Evo/EDS base directories.
    
    Use these functions instead of hard-coding "$HOME/.evolution".  This
    sets the stage for complying with the XDG Base Directory Specification.
    http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
    
    e_get_user_cache_dir()   returns (for now)  "$HOME/.evolution/cache"
    e_get_user_config_dir()  returns (for now)  "$HOME/.evolution"
    e_get_user_data_dir()    returns (for now)  "$HOME/.evolution"

 .../libedataserver/libedataserver-sections.txt     |    3 +
 docs/reference/libedataserver/tmpl/e-util.sgml     |   27 ++++++++
 libedataserver/e-data-server-util.c                |   67 ++++++++++++++++++++
 libedataserver/e-data-server-util.h                |    4 +
 4 files changed, 101 insertions(+), 0 deletions(-)

commit 341cd233218f2344aff4ec3ceb1a175d95c41b37
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jul 8 21:22:33 2010 +0200

    Bug #623795 - URI at the end of text isn't clickable

 camel/camel-mime-filter-tohtml.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1a1a274e160476e17e56079ed92ec23f4375f567
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jul 8 21:18:01 2010 +0200

    Bug #621609 - Can pass unknown UID to e_source_combo_box_set_active_uid

 libedataserverui/e-source-combo-box.c |   17 ++++++++++++-----
 libedataserverui/e-source-combo-box.h |    2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

commit 46938c348728d1c8bcacf6df9e0788b39783bd07
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun May 9 11:26:48 2010 -0500

    Migrate from CamelException to GError.

 camel/Makefile.am                                  |    3 -
 camel/camel-block-file.c                           |    2 +-
 camel/camel-cipher-context.c                       |   96 ++-
 camel/camel-cipher-context.h                       |   26 +-
 camel/camel-data-cache.c                           |   38 +-
 camel/camel-data-cache.h                           |   11 +-
 camel/camel-data-wrapper.c                         |   54 +-
 camel/camel-data-wrapper.h                         |   18 +-
 camel/camel-db.c                                   |  568 +++++++----
 camel/camel-db.h                                   |  100 +-
 camel/camel-debug.h                                |   34 +
 camel/camel-disco-diary.c                          |   29 +-
 camel/camel-disco-diary.h                          |    4 +-
 camel/camel-disco-folder.c                         |  143 ++-
 camel/camel-disco-folder.h                         |   36 +-
 camel/camel-disco-store.c                          |  123 ++-
 camel/camel-disco-store.h                          |   32 +-
 camel/camel-exception-list.def                     |   41 -
 camel/camel-exception.c                            |  282 ------
 camel/camel-exception.h                            |   80 --
 camel/camel-file-utils.c                           |   93 ++-
 camel/camel-file-utils.h                           |    8 +-
 camel/camel-filter-driver.c                        |  161 ++--
 camel/camel-filter-driver.h                        |   10 +-
 camel/camel-filter-search.c                        |   54 +-
 camel/camel-filter-search.h                        |    4 +-
 camel/camel-folder-search.c                        |  154 ++--
 camel/camel-folder-search.h                        |    6 +-
 camel/camel-folder-summary.c                       |  182 ++--
 camel/camel-folder-summary.h                       |   12 +-
 camel/camel-folder.c                               |  182 +++--
 camel/camel-folder.h                               |   76 +-
 camel/camel-gpg-context.c                          |  298 +++---
 camel/camel-http-stream.c                          |   83 ++-
 camel/camel-index-control.c                        |    4 +-
 camel/camel-index.h                                |    1 -
 camel/camel-lock-client.c                          |   35 +-
 camel/camel-lock-client.h                          |    4 +-
 camel/camel-lock-helper.c                          |   16 +-
 camel/camel-lock.c                                 |  101 +-
 camel/camel-lock.h                                 |   10 +-
 camel/camel-mime-filter-save.c                     |    2 +-
 camel/camel-mime-message.c                         |   19 +-
 camel/camel-mime-parser.c                          |   31 +-
 camel/camel-mime-parser.h                          |    4 +-
 camel/camel-mime-part-utils.c                      |   34 +-
 camel/camel-mime-part-utils.h                      |    5 +-
 camel/camel-mime-part.c                            |   73 +-
 camel/camel-mime-part.h                            |    5 +-
 camel/camel-movemail.c                             |   86 +-
 camel/camel-movemail.h                             |    4 +-
 camel/camel-multipart-signed.c                     |   79 +-
 camel/camel-multipart-signed.h                     |    2 +-
 camel/camel-multipart.c                            |   25 +-
 camel/camel-net-utils.c                            |   58 +-
 camel/camel-net-utils.h                            |    6 +-
 camel/camel-object.c                               |   13 +
 camel/camel-object.h                               |   10 +-
 camel/camel-offline-folder.c                       |   23 +-
 camel/camel-offline-folder.h                       |    4 +-
 camel/camel-offline-journal.c                      |   32 +-
 camel/camel-offline-journal.h                      |    6 +-
 camel/camel-offline-store.c                        |   34 +-
 camel/camel-offline-store.h                        |    8 +-
 camel/camel-provider.c                             |   36 +-
 camel/camel-provider.h                             |    9 +-
 camel/camel-sasl-anonymous.c                       |   22 +-
 camel/camel-sasl-cram-md5.c                        |    2 +-
 camel/camel-sasl-digest-md5.c                      |   32 +-
 camel/camel-sasl-gssapi.c                          |   39 +-
 camel/camel-sasl-login.c                           |   10 +-
 camel/camel-sasl-ntlm.c                            |    2 +-
 camel/camel-sasl-plain.c                           |    2 +-
 camel/camel-sasl-popb4smtp.c                       |   16 +-
 camel/camel-sasl.c                                 |   17 +-
 camel/camel-sasl.h                                 |    7 +-
 camel/camel-search-private.c                       |   11 +-
 camel/camel-search-private.h                       |    2 +-
 camel/camel-seekable-stream.c                      |   31 +-
 camel/camel-seekable-stream.h                      |   12 +-
 camel/camel-seekable-substream.c                   |   27 +-
 camel/camel-service.c                              |   71 +-
 camel/camel-service.h                              |   38 +-
 camel/camel-session.c                              |  116 ++-
 camel/camel-session.h                              |   40 +-
 camel/camel-smime-context.c                        |  198 ++--
 camel/camel-store.c                                |  234 +++--
 camel/camel-store.h                                |   71 +-
 camel/camel-stream-buffer.c                        |   47 +-
 camel/camel-stream-buffer.h                        |    6 +-
 camel/camel-stream-filter.c                        |   34 +-
 camel/camel-stream-fs.c                            |   81 ++-
 camel/camel-stream-fs.h                            |    9 +-
 camel/camel-stream-mem.c                           |    9 +-
 camel/camel-stream-null.c                          |    6 +-
 camel/camel-stream-process.c                       |   20 +-
 camel/camel-stream-vfs.c                           |   50 +-
 camel/camel-stream.c                               |   90 ++-
 camel/camel-stream.h                               |   36 +-
 camel/camel-tcp-stream-raw.c                       |   34 +-
 camel/camel-tcp-stream-ssl.c                       |   47 +-
 camel/camel-tcp-stream.c                           |   11 +-
 camel/camel-tcp-stream.h                           |   15 +-
 camel/camel-text-index.h                           |    1 -
 camel/camel-transport.c                            |   14 +-
 camel/camel-transport.h                            |    4 +-
 camel/camel-uid-cache.c                            |    6 +-
 camel/camel-url.c                                  |    9 +-
 camel/camel-url.h                                  |    4 +-
 camel/camel-vee-folder.c                           |  168 ++--
 camel/camel-vee-folder.h                           |    6 +-
 camel/camel-vee-store.c                            |   37 +-
 camel/camel-vtrash-folder.c                        |   22 +-
 camel/camel.h                                      |    1 -
 camel/providers/groupwise/camel-groupwise-folder.c |  265 +++---
 camel/providers/groupwise/camel-groupwise-folder.h |    4 +-
 .../providers/groupwise/camel-groupwise-journal.c  |   76 +-
 .../providers/groupwise/camel-groupwise-journal.h  |    8 +-
 .../providers/groupwise/camel-groupwise-provider.c |    5 +-
 camel/providers/groupwise/camel-groupwise-store.c  |  249 ++---
 camel/providers/groupwise/camel-groupwise-store.h  |    4 +-
 .../providers/groupwise/camel-groupwise-summary.c  |   12 +-
 .../groupwise/camel-groupwise-transport.c          |   31 +-
 camel/providers/groupwise/camel-groupwise-utils.c  |   18 +-
 camel/providers/imap/camel-imap-command.c          |  154 ++--
 camel/providers/imap/camel-imap-command.h          |   12 +-
 camel/providers/imap/camel-imap-folder.c           |  591 ++++++------
 camel/providers/imap/camel-imap-folder.h           |   19 +-
 camel/providers/imap/camel-imap-journal.c          |   22 +-
 camel/providers/imap/camel-imap-message-cache.c    |   98 +--
 camel/providers/imap/camel-imap-message-cache.h    |   21 +-
 camel/providers/imap/camel-imap-search.c           |   12 +-
 camel/providers/imap/camel-imap-store.c            |  562 +++++------
 camel/providers/imap/camel-imap-store.h            |    4 +-
 camel/providers/imap/camel-imap-summary.c          |   12 +-
 camel/providers/imap/camel-imap-wrapper.c          |   14 +-
 camel/providers/imapx/Makefile.am                  |    2 -
 camel/providers/imapx/camel-imapx-exception.c      |   79 --
 camel/providers/imapx/camel-imapx-exception.h      |   35 -
 camel/providers/imapx/camel-imapx-folder.c         |  135 ++--
 camel/providers/imapx/camel-imapx-folder.h         |    4 +-
 camel/providers/imapx/camel-imapx-provider.c       |    2 -
 camel/providers/imapx/camel-imapx-server.c         | 1031 +++++++++++---------
 camel/providers/imapx/camel-imapx-server.h         |   52 +-
 camel/providers/imapx/camel-imapx-store.c          |  313 +++---
 camel/providers/imapx/camel-imapx-store.h          |    2 +-
 camel/providers/imapx/camel-imapx-stream.c         |  132 ++--
 camel/providers/imapx/camel-imapx-stream.h         |   20 +-
 camel/providers/imapx/camel-imapx-summary.c        |   17 +-
 camel/providers/imapx/camel-imapx-utils.c          |  410 ++++----
 camel/providers/imapx/camel-imapx-utils.h          |   32 +-
 camel/providers/imapx/camel-imapx-view-summary.c   |    2 +-
 camel/providers/imapx/camel-imapx-view-summary.h   |    2 +-
 camel/providers/imapx/test-imapx.c                 |    6 +-
 camel/providers/local/camel-local-folder.c         |   66 +-
 camel/providers/local/camel-local-folder.h         |   10 +-
 camel/providers/local/camel-local-store.c          |  127 ++--
 camel/providers/local/camel-local-summary.c        |   48 +-
 camel/providers/local/camel-local-summary.h        |   16 +-
 camel/providers/local/camel-maildir-folder.c       |  101 +-
 camel/providers/local/camel-maildir-folder.h       |    2 +-
 camel/providers/local/camel-maildir-store.c        |  124 ++--
 camel/providers/local/camel-maildir-summary.c      |   47 +-
 camel/providers/local/camel-mbox-folder.c          |  105 +--
 camel/providers/local/camel-mbox-folder.h          |    2 +-
 camel/providers/local/camel-mbox-store.c           |  156 ++--
 camel/providers/local/camel-mbox-summary.c         |  163 ++--
 camel/providers/local/camel-mbox-summary.h         |    6 +-
 camel/providers/local/camel-mh-folder.c            |   61 +-
 camel/providers/local/camel-mh-folder.h            |    2 +-
 camel/providers/local/camel-mh-store.c             |   92 +-
 camel/providers/local/camel-mh-summary.c           |   23 +-
 camel/providers/local/camel-spool-folder.c         |   25 +-
 camel/providers/local/camel-spool-folder.h         |    2 +-
 camel/providers/local/camel-spool-store.c          |  124 ++--
 camel/providers/local/camel-spool-summary.c        |   73 +-
 camel/providers/local/camel-spool-summary.h        |    8 +-
 camel/providers/nntp/Makefile.am                   |   16 +-
 camel/providers/nntp/camel-nntp-auth.c             |   92 --
 camel/providers/nntp/camel-nntp-auth.h             |   36 -
 camel/providers/nntp/camel-nntp-folder.c           |  159 ++--
 camel/providers/nntp/camel-nntp-folder.h           |    4 +-
 camel/providers/nntp/camel-nntp-grouplist.c        |  221 -----
 camel/providers/nntp/camel-nntp-grouplist.h        |   55 -
 camel/providers/nntp/camel-nntp-newsrc.c           |  647 ------------
 camel/providers/nntp/camel-nntp-newsrc.h           |   36 -
 camel/providers/nntp/camel-nntp-store.c            |  274 +++---
 camel/providers/nntp/camel-nntp-store.h            |    9 +-
 camel/providers/nntp/camel-nntp-stream.c           |   49 +-
 camel/providers/nntp/camel-nntp-stream.h           |    3 +-
 camel/providers/nntp/camel-nntp-summary.c          |   55 +-
 camel/providers/nntp/camel-nntp-summary.h          |    3 +-
 camel/providers/nntp/camel-nntp-utils.c            |  307 ------
 camel/providers/nntp/camel-nntp-utils.h            |   34 -
 camel/providers/pop3/camel-pop3-engine.c           |    4 +-
 camel/providers/pop3/camel-pop3-folder.c           |  120 ++--
 camel/providers/pop3/camel-pop3-folder.h           |    4 +-
 camel/providers/pop3/camel-pop3-store.c            |  210 +++--
 camel/providers/pop3/camel-pop3-store.h            |    6 +-
 camel/providers/pop3/camel-pop3-stream.c           |   40 +-
 .../providers/sendmail/camel-sendmail-transport.c  |   40 +-
 camel/providers/smtp/camel-smtp-transport.c        |  476 +++++-----
 camel/tests/folder/test1.c                         |    4 -
 camel/tests/folder/test10.c                        |   13 +-
 camel/tests/folder/test11.c                        |   64 +-
 camel/tests/folder/test2.c                         |    4 -
 camel/tests/folder/test3.c                         |   65 +-
 camel/tests/folder/test4.c                         |    4 -
 camel/tests/folder/test5.c                         |    4 -
 camel/tests/folder/test6.c                         |    4 -
 camel/tests/folder/test7.c                         |    4 -
 camel/tests/folder/test8.c                         |   53 +-
 camel/tests/folder/test9.c                         |   43 +-
 camel/tests/lib/camel-test-provider.c              |    6 +-
 camel/tests/lib/camel-test.c                       |    5 +-
 camel/tests/lib/camel-test.h                       |    1 +
 camel/tests/lib/folders.c                          |  144 ++--
 camel/tests/lib/messages.c                         |   26 +-
 camel/tests/lib/streams.c                          |   72 +-
 camel/tests/message/test4.c                        |    6 +-
 camel/tests/mime-filter/test-charset.c             |    8 +-
 camel/tests/mime-filter/test-crlf.c                |    8 +-
 camel/tests/mime-filter/test-tohtml.c              |   16 +-
 camel/tests/mime-filter/test1.c                    |    4 +-
 camel/tests/misc/url.c                             |   10 +-
 camel/tests/smime/pgp-mime.c                       |    6 +-
 camel/tests/smime/pgp.c                            |   48 +-
 camel/tests/smime/pkcs7.c                          |    6 +-
 camel/tests/stream/test1.c                         |   20 +-
 camel/tests/stream/test3.c                         |    2 +-
 configure.ac                                       |    2 +-
 .../libecal/tmpl/e-cal-check-timezones.sgml        |   13 +
 docs/reference/camel/camel-docs.sgml               |    1 -
 docs/reference/camel/camel-sections.txt            |   17 -
 .../reference/camel/tmpl/camel-cipher-context.sgml |   69 ++-
 docs/reference/camel/tmpl/camel-data-cache.sgml    |   10 +-
 docs/reference/camel/tmpl/camel-data-wrapper.sgml  |    3 +
 docs/reference/camel/tmpl/camel-db.sgml            |   96 +-
 docs/reference/camel/tmpl/camel-disco-diary.sgml   |    4 +-
 docs/reference/camel/tmpl/camel-disco-folder.sgml  |    6 +-
 docs/reference/camel/tmpl/camel-disco-store.sgml   |    7 +-
 docs/reference/camel/tmpl/camel-exception.sgml     |  110 ---
 docs/reference/camel/tmpl/camel-file-utils.sgml    |    4 +
 docs/reference/camel/tmpl/camel-filter-driver.sgml |   10 +-
 docs/reference/camel/tmpl/camel-filter-search.sgml |    4 +-
 docs/reference/camel/tmpl/camel-folder-search.sgml |    6 +-
 .../reference/camel/tmpl/camel-folder-summary.sgml |   10 +-
 docs/reference/camel/tmpl/camel-folder.sgml        |   24 +-
 docs/reference/camel/tmpl/camel-lock-client.sgml   |    2 +-
 docs/reference/camel/tmpl/camel-lock.sgml          |    8 +-
 docs/reference/camel/tmpl/camel-mime-parser.sgml   |    2 +
 docs/reference/camel/tmpl/camel-mime-part.sgml     |    3 +
 docs/reference/camel/tmpl/camel-movemail.sgml      |    2 +-
 .../camel/tmpl/camel-multipart-signed.sgml         |    2 +-
 docs/reference/camel/tmpl/camel-net-utils.sgml     |    4 +-
 .../reference/camel/tmpl/camel-offline-folder.sgml |    2 +-
 .../camel/tmpl/camel-offline-journal.sgml          |    4 +-
 docs/reference/camel/tmpl/camel-offline-store.sgml |    6 +-
 docs/reference/camel/tmpl/camel-provider.sgml      |    8 +-
 docs/reference/camel/tmpl/camel-sasl.sgml          |    4 +-
 .../camel/tmpl/camel-seekable-stream.sgml          |    2 +
 docs/reference/camel/tmpl/camel-service.sgml       |    8 +-
 docs/reference/camel/tmpl/camel-session.sgml       |   21 +-
 docs/reference/camel/tmpl/camel-store.sgml         |   26 +-
 docs/reference/camel/tmpl/camel-stream-buffer.sgml |    2 +
 docs/reference/camel/tmpl/camel-stream-fs.sgml     |    3 +
 docs/reference/camel/tmpl/camel-stream.sgml        |    7 +
 docs/reference/camel/tmpl/camel-tcp-stream.sgml    |    1 +
 docs/reference/camel/tmpl/camel-transport.sgml     |    2 +-
 docs/reference/camel/tmpl/camel-unused.sgml        |  125 +++
 docs/reference/camel/tmpl/camel-url.sgml           |    2 +-
 docs/reference/camel/tmpl/camel-vee-folder.sgml    |    4 +-
 po/POTFILES.in                                     |    2 +-
 273 files changed, 7338 insertions(+), 8301 deletions(-)

commit 20aa2b45cd7d11866c7915016742572134ee9c96
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jul 8 13:25:33 2010 +0200

    Use text/vcard content type on WebDAV PUT request
    
    See bug #604650 for more details.

 .../backends/webdav/e-book-backend-webdav.c        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b032b39ece24c8343b48e6cf2d9da003b418981e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Wed Jul 7 18:27:43 2010 +0200

    Updated Galician translations

 po/gl.po |  376 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 191 insertions(+), 185 deletions(-)

commit bb7329a80d768b2b2cf7c2ffb558b552912191f5
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Mon Jul 5 14:30:27 2010 +0530

    Add a function to get the job queue info

 camel/providers/imapx/camel-imapx-server.c |   26 ++++++++++++++++++++++++++
 camel/providers/imapx/camel-imapx-server.h |    5 +++++
 camel/providers/imapx/camel-imapx-utils.c  |    7 +++++++
 camel/providers/imapx/camel-imapx-utils.h  |   10 ++++++++++
 4 files changed, 48 insertions(+), 0 deletions(-)

commit 6ff4c69f9e066f007d242b6b72232c9d42fc038f
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Mon Jul 5 13:05:10 2010 +0530

    Add signal handlers when folder selection changes and when connection shuts down

 camel/providers/imapx/camel-imapx-server.c |   43 ++++++++++++++++++++++++++++
 camel/providers/imapx/camel-imapx-server.h |    4 ++
 2 files changed, 47 insertions(+), 0 deletions(-)

commit 4d7b2ae1052dbde2b99a6e147c4e4a116d32b5bc
Author: Maciej Piechotka <uzytkownik2@gmail.com>
Date:   Sat Jul 3 12:41:50 2010 -0400

    Bug 623431 - Use gweather-3.0 when building with gtk3

 configure.ac |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 0f75ca408f1386494100ba934625de979f0c17bc
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 3 12:17:42 2010 -0400

    Bug 623430 - libedataserverui.pc.in hardcodes 1.2 API version

 configure.ac                            |    6 +++---
 libedataserverui/Makefile.am            |    6 +++---
 libedataserverui/libedataserverui.pc.in |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

commit f44ecb68679ea3134d7b3c5d5f346b640a11af45
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Jul 2 11:56:57 2010 +0100

    Update unseen count as new messages come in
    
    When we get notified of new messages in the idle thread, or when they arrive
    during our re-fetch of all flags (and we suddenly find we've got flags for a
    message that didn't previously exist), ensure that we update the unseen count
    according to the flags of the new messages.
    
    This _doesn't_ handle the case where we called fetch_new_messages() directly
    from refresh_info_start() because we _knew_ there were new messages, but in
    fact there are _more_ new messages than we expected. We may have to switch to
    a model where we say 'update flags for any UID greater than $X'.

 camel/providers/imapx/camel-imapx-server.c |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

commit fe84f63ac7b0eb51356451e5aafe02e27a03d4e4
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Jul 2 10:58:11 2010 +0100

    Make NSS database initialisation more robust, handle errors better
    
    Since commit 9116943e we only attempt to open the new SQL database, but
    some users are reporting issues. Be more careful about reporting errors
    when that happens, and also fall back to the old DBM database if the SQL
    database fails to initialise.

 camel/camel.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

commit 77b29a6e456f01e0a4241ca767233f77ab03a802
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Jul 2 10:00:02 2010 +0100

    Keep better track of server-side UNREAD count.
    
    There are various circumstances in which the UNREAD count will change --
    new unseen messages arriving, flags changes from the client, unseen
    messages being expunged, etc. Keep track of those to improve the
    accuracy of the unread count, to avoid the QRESYNC sanity check
    triggering so often on minor issues that weren't the bug I was looking
    for. For this, we have to keep track of whether a FETCH or VANISHED response
    was solicited or unsolicited in certain cases.

 camel/providers/imapx/camel-imapx-server.c |   38 +++++++++++++++++++--------
 camel/providers/imapx/camel-imapx-utils.c  |   17 +++++++++---
 camel/providers/imapx/camel-imapx-utils.h  |    4 +-
 3 files changed, 41 insertions(+), 18 deletions(-)

commit 6df64040a866166d54cc35078f204ee60e474f36
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Jul 2 09:57:31 2010 +0100

    Don't refetch message headers we already have.
    
    We were issuing a headers FETCH starting from the last known UID. But we
    already _had_ the headers for the last known UID. Start from $UID+1 instead.

 camel/providers/imapx/camel-imapx-server.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

commit 2497833b3968fe5d8134c919d601a0dd9b23ab74
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Fri Jul 2 09:43:38 2010 +0100

    Add sanity check after QRESYNC
    
    If the total number of messages, unseen count and modseq don't match
    what we think they should be, then fall back to refetching all flags as
    we would have done without QRESYNC.

 camel/providers/imapx/camel-imapx-server.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

commit 83f1c3850cd16fad9800ee7e00acdbc06cc1d69d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Jul 1 20:13:41 2010 +0200

    Updated Spanish translation

 po/es.po | 1562 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 773 insertions(+), 789 deletions(-)

commit f686f27a89f65f6c199664af70c8aa69914600b2
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Thu Jul 1 09:01:27 2010 +0100

    Fix memory leak in imapx_continuation() with SASL auth
    
    ==4945== 1 bytes in 1 blocks are definitely lost in loss record 48 of 23,077
    ==4945==    at 0x4A0515D: malloc (vg_replace_malloc.c:195)
    ==4945==    by 0x319A044AE2: g_malloc (gmem.c:132)
    ==4945==    by 0x319A05C3BD: g_strdup (gstrfuncs.c:102)
    ==4945==    by 0x6478E63: camel_sasl_challenge_base64 (camel-sasl.c:326)
    ==4945==    by 0x12C54E72: imapx_continuation (camel-imapx-server.c:1698)
    ==4945==    by 0x12C552CC: imapx_step (camel-imapx-server.c:1862)

 camel/providers/imapx/camel-imapx-server.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit 2999551cbb78f902cd8321c0c2eb5327474e8a3d
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Thu Jul 1 08:59:59 2010 +0100

    Fix memory leak in summary_header_to_db()
    
    ==4945== 9 bytes in 1 blocks are definitely lost in loss record 1,482 of 23,077
    ==4945==    at 0x4A0515D: malloc (vg_replace_malloc.c:195)
    ==4945==    by 0x319A044AE2: g_malloc (gmem.c:132)
    ==4945==    by 0x319A05C3BD: g_strdup (gstrfuncs.c:102)
    ==4945==    by 0x6466990: summary_header_to_db (camel-folder-summary.c:296)
    ==4945==    by 0x12C48A2B: summary_header_to_db (camel-imapx-summary.c:289)
    ==4945==    by 0x6463B69: camel_folder_summary_save_to_db (camel-folder-summary.c:2316)
    ==4945==    by 0x12C507B2: imapx_command_sync_changes_done (camel-imapx-server.c:4227)

 camel/camel-folder-summary.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit bed388e3a851596e1163fed8ee57cb41c81b9b10
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 20:22:36 2010 +0100

    Store Junk and NotJunk flags in IMAP server
    
    Strictly speaking we shouldn't be doing this if the server won't understand
    them and doesn't have \* in PERMANENTFLAGS -- but there are already bugs with
    that anyway, when we try to set receipt-handled. I'll get to that shortly...

 camel/providers/imapx/camel-imapx-server.c  |    4 +++-
 camel/providers/imapx/camel-imapx-summary.h |    1 +
 camel/providers/imapx/camel-imapx-utils.c   |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)

commit 30179bf132c21252e01ed7fddd93dcf4be71ab26
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Jun 30 11:48:51 2010 -0400

    Update API documentation.

 .../libecal/tmpl/e-cal-check-timezones.sgml        |    3 +++
 docs/reference/camel/camel-sections.txt            |    3 +++
 .../reference/camel/tmpl/camel-cipher-context.sgml |    6 ++++++
 docs/reference/camel/tmpl/camel-provider.sgml      |   14 ++++++++++++++
 docs/reference/camel/tmpl/camel-store.sgml         |    7 +++++++
 docs/reference/libedataserver/tmpl/e-util.sgml     |    4 ++--
 .../libedataserverui/libedataserverui-sections.txt |    1 +
 .../libedataserverui/tmpl/e-name-selector.sgml     |    9 +++++++++
 8 files changed, 45 insertions(+), 2 deletions(-)

commit 23bdeb12ef3b8a4b6d63f8dd008594feca760540
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 13:22:25 2010 +0100

    Calculate can_qresync after fetching STATUS

 camel/providers/imapx/camel-imapx-server.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit ac6557eb872437e4d7b44fc01d9eafcc404b4d8e
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 11:08:54 2010 +0100

    Fix starting UID in QRESYNC SELECT.
    
    The indices in the folder summary count from zero, not one.

 camel/providers/imapx/camel-imapx-server.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7dcedc3ef77ddcf4b7ca6bb1fbab7d3246edca34
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 09:49:12 2010 +0100

    Add proper QRESYNC support on SELECT; use it for refresh_info
    
    We aren't yet correctly updating the folder's modseq every time, so we're
    often asking for more than we need. That's better than asking for _less_ than
    we need though -- will go over that part very carefully in separate commit(s).
    
    We still aren't handling uidvalidity either. RSN...

 camel/providers/imapx/camel-imapx-provider.c |    2 +
 camel/providers/imapx/camel-imapx-server.c   |   91 ++++++++++++++++++++++++--
 camel/providers/imapx/camel-imapx-server.h   |    2 +
 camel/providers/imapx/camel-imapx-store.c    |    3 +
 camel/providers/imapx/camel-imapx-store.h    |    1 +
 5 files changed, 93 insertions(+), 6 deletions(-)

commit b57a6af1724e1447e35e2003a14bf74891182873
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 09:44:25 2010 +0100

    Propagate SELECT error properly to dependent commands

 camel/providers/imapx/camel-imapx-server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit de786c4147333489ac1dfb25b378acf96541919c
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Wed Jun 30 09:39:22 2010 +0100

    Add support for * VANISHED (EARLIER) [uidset...]
    
    (Actually just throw away anything in the parentheses).
    
    We'll need this for QRESYNC SELECT

 camel/providers/imapx/camel-imapx-server.c |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

commit e1aa0719162620c50ad6f402a1c58ed817f75bf7
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jun 29 19:17:59 2010 -0400

    Work around sudden disappearance of GdkRegion in GTK+ 2.90.5.
    
    API was deprecated and removed in less than two hours!  Sheesh!

 libedataserverui/gtk-compat.h |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

commit 9a8942918cfb776ae496e8d316ffc0dc17a6253b
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Tue Jun 29 23:36:13 2010 +0530

    post release version bump

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)