commit 057e2e8464a30f549aceda877f2bd948fdc199f0
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Aug 30 16:52:04 2011 +0200

    Do not expose password in imapx log

 camel/providers/imapx/camel-imapx-server.c |   10 +++++++---
 camel/providers/imapx/camel-imapx-stream.c |    6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

commit 6fbfcdd627686c78fad10efc40204a877b1e4ca0
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Aug 23 14:38:54 2011 +0200

    Bug #576398 - vfolder not showing new messages from nntp group

 camel/providers/nntp/camel-nntp-folder.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

commit 4de215d8a23a1e5486daa5f8d65671f5e7b0193b
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Aug 23 13:20:19 2011 +0200

    Bug #562912 - Unread vfolder marks unread messages as read

 camel/camel-vee-folder.c  |  118 +++++++++++++++++++++++++++++++++++++++++---
 camel/camel-vee-folder.h  |    1 +
 camel/camel-vee-summary.c |  103 +++++++--------------------------------
 3 files changed, 130 insertions(+), 92 deletions(-)

commit 6c995c5a3290225f5db7c140872c0d0198bc8bd7
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Aug 22 19:20:33 2011 +0200

    Bug #652437 - NNTP messages is sometimes displayed as grey

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

commit 3611a710a22f5e491c0eb69a501843b7e7be282f
Author: Ritesh Khadgaray <khadgaray@gmail.com>
Date:   Fri Aug 19 09:20:20 2011 +0200

    Bug #651693 - Decode QP encoded names when invoking 'Expand list Inline'

 libedataserverui/e-name-selector-entry.c |   39 +++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

commit 55728c027712626c278c7319499e91ab6ed88272
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:   Thu Aug 18 22:10:26 2011 +0200

    Updated Dutch translation by Wouter Bolsterlee

 po/nl.po |  469 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 229 insertions(+), 240 deletions(-)

commit 708d0f9ea92c145e1c5f0b3968fb841be6d0ca82
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Fri Aug 19 19:37:37 2011 +0200

    Added UG translation

 po/ug.po | 1481 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 749 insertions(+), 732 deletions(-)

commit 81f93199c8e38bd98577944aae9109bf34451ffe
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Aug 18 16:16:26 2011 +0200

    Bug #651469 - Folders don't update after moving mails in maildir

 camel/providers/local/camel-maildir-folder.c |   31 +++++++++++++++++++++----
 1 files changed, 26 insertions(+), 5 deletions(-)

commit 31ccf92c03f51ffa22ef8a713b4e971e38e2ef22
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Aug 14 01:10:58 2011 +0100

    Bug 656490 - imapx: Memory leak of stream tokenbuf
    (cherry picked from commit 51ebadee128158e7d73dc8e29fd6e67ae229b7a0)

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

commit a6698c442d96377075101a026b34aa152a7c7a01
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sun Aug 14 00:47:48 2011 +0100

    Bug 656487 - Memory leak in imapx fetch_folders_for_namespaces()
    
    We need to free the GSList but the namespaces themselves are fine.
    (cherry picked from commit d707f577c0e23f11ecae37408477885c5b260d50)

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

commit ebdb1c4315577bdbf2111dd7d1fa6694757ff31f
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Sat Aug 13 23:40:18 2011 +0100

    Bug #656480 - Memory leak in camel_folder_search_search()
    
    We don't unref sexp on failure.
    (cherry picked from commit 86f95492d12843611f9cbb7f8635604f4f251278)

 camel/camel-search-sql-sexp.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit 6afce789a566e0edc726ab94fd4307a3917253cf
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Fri Aug 12 11:36:10 2011 +0200

    calendar file backend: fixed incomplete sanity check in e_cal_create_object(), part II
    
    Cherry-picking from master lost one hunk for
    e_cal_backend_file_compute_changes_foreach_key(), causing compile errors.
    Here's the rest of the original patch for the gnome-2-32 branch.

 calendar/backends/file/e-cal-backend-file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c58cf949c8fdcf56630d8db1ed24d1305548d89c
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu Aug 4 21:18:42 2011 +0200

    libecal: e_cal_remove_object() must remove *all* recurrences
    
    Traditionally, e_cal_remove_object() has always removed all
    recurrences, despite the use of MOD_THIS underneath. That was due to
    the uncertain semantic of MOD_THIS without rid.
    
    Since clarifying that semantic and fixing the (file) backend
    accordingly, e_cal_remove_object() started to behave differently: of
    an event series with detached recurrences, only the parent event was
    removed, which then caused the failures fixed by the previous commits.
    
    This commit fixes that by switching to MOD_ALL, which properly
    reflects the semantic of the API call. It was tested successfully with
    the file backend.
    
    (cherry picked from commit 272cb7d5ef42a0c1acb72fd3a0fba2bf53f959c8)

 calendar/libecal/e-cal.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

commit ddc2261568c4a4a6d5a39adabaa3bc190b380991
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Tue Aug 9 11:26:16 2011 +0300

    calendar file backend: fixed incomplete sanity check in e_cal_create_object()
    
    e_cal_create_object() traditionally is used for a new events which are
    unrelated to anything in the calendar. Adding detached recurrences
    to an existing meeting series has to be done with e_cal_modify_object().
    
    The code did not correctly reject the addition of a parent event for a
    previously added child event event because lookup_component() returned
    NULL in that case.
    
    This commit renames lookup_component() and redefines the return value
    to match what it is used for: checking for the existance of a UID.
    (cherry picked from commit 0c178bbab1008a8574d58c2019c22f892010d9a0)

 calendar/backends/file/e-cal-backend-file.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

commit 6c118d9e5057124e34739b67db177e80c7d6e0f3
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu Aug 4 17:55:07 2011 +0200

    ecal file backend: avoid manipulating the UID inside component_add()
    
    This commit fixes the following memory handling problem:
    ==10069== Invalid read of size 1
    ==10069==    at 0x4C25812: __GI_strlen (mc_replace_strmem.c:284)
    ==10069==    by 0x8EF011E: g_strdup (gstrfuncs.c:99)
    ==10069==    by 0xF4E08B6: e_cal_backend_file_create_object (e-cal-backend-file.c:2363)
    ==10069==    by 0x93E6061: e_cal_backend_sync_create_object (e-cal-backend-sync.c:214)
    ==10069==    by 0x93E86D3: _e_cal_backend_create_object (e-cal-backend-sync.c:630)
    ==10069==    by 0x93DD40B: e_cal_backend_create_object (e-cal-backend.c:1017)
    ==10069==    by 0x93F0C34: impl_Cal_createObject (e-data-cal.c:401)
    ==10069==    by 0x4E75383: _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING (e-gdbus-marshallers.c:377)
    ==10069==    by 0x820999E: g_closure_invoke (gclosure.c:773)
    ==10069==    by 0x8225972: signal_emit_unlocked_R (gsignal.c:3256)
    ==10069==    by 0x82248D0: g_signal_emit_valist (gsignal.c:2997)
    ==10069==    by 0x8224DBC: g_signal_emit (gsignal.c:3044)
    ==10069==  Address 0x1499c7b0 is 0 bytes inside a block of size 39 free'd
    ==10069==    at 0x4C240FD: free (vg_replace_malloc.c:366)
    ==10069==    by 0x9DE952C: icalvalue_free (in /usr/lib/libical.so.0.44.0)
    ==10069==    by 0x9DDB796: icalproperty_set_value (in /usr/lib/libical.so.0.44.0)
    ==10069==    by 0x4E4FFA2: e_cal_component_set_uid (e-cal-component.c:1479)
    ==10069==    by 0xF4DB8F3: check_dup_uid (e-cal-backend-file.c:498)
    ==10069==    by 0xF4DBD9B: add_component (e-cal-backend-file.c:614)
    ==10069==    by 0xF4E0894: e_cal_backend_file_create_object (e-cal-backend-file.c:2356)
    ==10069==    by 0x93E6061: e_cal_backend_sync_create_object (e-cal-backend-sync.c:214)
    ==10069==    by 0x93E86D3: _e_cal_backend_create_object (e-cal-backend-sync.c:630)
    ==10069==    by 0x93DD40B: e_cal_backend_create_object (e-cal-backend.c:1017)
    ==10069==    by 0x93F0C34: impl_Cal_createObject (e-data-cal.c:401)
    ==10069==    by 0x4E75383: _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING (e-gdbus-marshallers.c:377)
    
    This occurs when a client (incorrectly) tries to create a VEVENT with
    RECURRENCE-ID for a UID which already exists. The sequence of events is this:
    - e_cal_backend_file_create_object() calls lookup_component(),
      which returns NULL because it only checks for the parent event
      (will be fixed separately).
    - e_cal_backend_file_create_object() keeps a pointer to the UID.
    - check_dup_uid() repeats the UID check, but this time finds that it
      is already taken and replaces the existing UID in the component
      before adding it. The pointer in e_cal_backend_file_create_object()
      points to freed memory.
    
    I've seen cases where the hash ended up using the original UID as key,
    with a component inside that had the new, replaced UID. As a result,
    retrieving the event as reported by e_cal_get_object_list() (= rewritten UID)
    failed in e_cal_get_object() (= original UID).
    
    The UID should not be overwritten. I can't verify it anymore (events where it occured
    have already been deleted), but this rewriting might explain why some of my
    meeting update emails couldn't be applied to previously imported events.
    
    Therefore this patch moves check_dup_uid() out of component_add(). This check
    and rewriting only makes sense when reading the existing calendar file,
    as a safe-guard against on-disk corruption. When adding or modifying events
    via the API, the right reaction is to add a missing UID or or reject the
    operation with an error.
    
    All places where component_add() is used should have the necessary checks
    or are preceeded by a remove_component(), which removes the UID first.
    (cherry picked from commit ae4f4292b0e5ecbbdc74c90b75cc31367d0d270a)

 calendar/backends/file/e-cal-backend-file.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit e94ba4727f9febdbdb58cef8dbda8033a1439449
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Aug 3 12:03:51 2011 +0200

    Bug #655748 - rdate parsing failure: unknown value for period 20068

 calendar/libecal/e-cal-component.c |   15 +++++++++------
 calendar/libecal/e-cal-recur.c     |   10 ++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

commit 6c943cd99d1c969d8259dc9143f23c4bd2e1536a
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Thu Jul 28 17:19:00 2011 +0100

    Make e-{addressbook,calendar}-factory supersede old factory at startup.
    
    I've lost count of the number of times I've run a factory for debugging
    purposes but actually discovered that there's another one already running,
    so my new one isn't being used. It's particularly likely because when you
    *kill* an existing factory Evolution will bitch about how calendars will
    never work again until you restart Evolution... but it *will* restart the
    factory automatically!
    
    So make the new factory supersede an old one, and make the old one quit
    when it's superseded. This will make debugging a whole lot saner.
    (cherry picked from commit 8266e0918ff843af14913fb16723cc8b18000a8d)

 addressbook/libedata-book/e-data-book-factory.c |    4 +++-
 calendar/libedata-cal/e-data-cal-factory.c      |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit 75cde2f0f2321e66d35f97cd5fd68f580d7b2014
Author: David Woodhouse <David.Woodhouse@intel.com>
Date:   Thu Jul 28 17:25:38 2011 +0100

    Fix stray unref of server in imapx add_folders_to_summary()
    
    This was causing a double (well, multiple) free and use-after-free of the
    server; it has no business here.
    
    It was actually seen when a broken Yahoo server gave a namespace with NIL
    for the dir_sep, thus causing problems with subfolders.
    (cherry picked from commit c3460e79201ba988500014386dbc3f8781dbc5f3)

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

commit 411b03ecb13c3528bf9a905bd3dd30d1715809b9
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Thu Jul 7 16:27:37 2011 +0200

    Added UG translation

 po/ug.po | 1408 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 670 insertions(+), 738 deletions(-)

commit ad7e9324795eb853c85a1d3af7096b1ad92a7cc9
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jun 30 13:29:45 2011 +0200

    Bug #653385 - ldaps fails with server using self-signed certificate

 addressbook/backends/ldap/e-book-backend-ldap.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit e5a8bfb519888fe9b27c95ad67d223362a27d296
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:   Fri Jun 24 20:41:21 2011 +0200

    Updated Serbian translation

 po/sr.po       | 6865 ++++++++++++++++++++++++++++++--------------------------
 po/sr@latin.po | 6797 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 7454 insertions(+), 6208 deletions(-)

commit 75c691d7d3d0baf860dc55026dc4ae2916d170d7
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jun 21 12:30:57 2011 +0200

    Bug #648468 - POP3 doesn't recover or claim error after lost connection

 camel/providers/pop3/camel-pop3-engine.c |   14 +++---
 camel/providers/pop3/camel-pop3-engine.h |    2 +-
 camel/providers/pop3/camel-pop3-folder.c |   79 ++++++++++++++++++------------
 camel/providers/pop3/camel-pop3-folder.h |    2 +-
 camel/providers/pop3/camel-pop3-store.c  |   23 +++++----
 camel/providers/pop3/camel-pop3-stream.c |    8 +++-
 6 files changed, 76 insertions(+), 52 deletions(-)

commit 8a0e80ed364117355132901caa94a737997674d4
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jun 15 15:08:21 2011 +0200

    Bug #565961 - Crash with recurring all-day event

 calendar/libecal/e-cal.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

commit 7b2d680e89f043b024d8b2b7c5c8a2150a6e2f99
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Fri Jun 10 09:54:33 2011 +0200

    Added UG translation

 po/ug.po | 2606 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1375 insertions(+), 1231 deletions(-)

commit 60cca78af9a9c3cf27c60f02b7bec59bd23660ba
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Tue Jun 7 18:20:35 2011 +0530

    CamelVeeFolder: Check for the presence of unmatched folder before
    accessing full_name, error in previous commit.

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

commit fd286b57ecaf5d68cf15c4852c1b2922cb5e0370
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Tue Jun 7 15:22:45 2011 +0530

    Bug 640054 - sqlite summary hang. Fix vfolder transactions.

 camel/camel-vee-folder.c |  199 +++++++++++++++++++++++++++-------------------
 1 files changed, 118 insertions(+), 81 deletions(-)

commit 6ddc87c4e0d7375932aa329bab2a657cb5192122
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Tue Jun 7 11:56:21 2011 +0200

    e-data-cal-view.c: fixed cherry-pick mistake
    
    When cherry-picking from master branch, code using
    e_util_utf8_make_valid() was accidentally added to the gnome-3.0. That
    function is not available there because the corresponding bug fix in
    master has not been backported (was considered too complex).
    
    This patch removes e_util_utf8_make_valid() again.

 calendar/libedata-cal/e-data-cal-view.c |   38 ++++++------------------------
 1 files changed, 8 insertions(+), 30 deletions(-)

commit 54c210f010d4a38b508bdf4a4479fcbe3942fdc4
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Tue May 17 09:45:24 2011 +0200

    calendar: include rid in "objects-removed" ECalView signal
    
    Since migration to D-Bus for libecal<->EDS communication, the
    RECURRENCE-ID (rid) has not been sent in the "objects-removed" signal.
    As a result, a backend could not communicate the removal of specific
    recurrences.
    
    This patch adds the rid after a newline to the string stored
    internally and transferred via D-Bus. Because the newline is only
    added when needed, traditional uid-only removals look the same as
    before and continue to work with older versions of libecal. A uid+rid
    combination will look like an unknown uid to an older libecal which
    does not know how to split them. Therefore the D-Bus API is considered
    unchanged and the interface number is not increased.
    
    Whether clients really interpret "objects-removed" with empty rid (=
    parent removed) or valid rid (= child removed) correctly is outside
    the scope of this patch.
    (cherry picked from commit 768391222fe89cbcfc1eb38be9deb9ff201ac534)

 calendar/libecal/e-cal-view.c           |   17 ++++++++++---
 calendar/libedata-cal/e-data-cal-view.c |   41 +++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 9 deletions(-)

commit 6ca796ef46900d5403c9a1bc0b26aa39c0ff6e35
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 14:04:37 2011 +0200

    calendar file backend: support remove with CALOBJ_MOD_ONLY_THIS
    
    Support for this capability is easy:
    - report removal of the detached recurrence
    - report error when not found
    - avoid modifying the parent (= full_object)
    
    (Adapted from commit 17a86ec294883db631fee24285c2585dcb0b2098)

 calendar/backends/file/e-cal-backend-file.c |   34 ++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 6 deletions(-)

commit 16d233b0742fd897e02219bf6e8c353db3441273
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 13:30:06 2011 +0200

    calendar file backend: removal notification for detached recurrence, part 2
    
    e_cal_remove_object_with_mod() can only return one pair of old/new
    object pointers to the caller. When the function modifies the parent
    and removes a detached recurrence, the removal of the detached
    recurrence had to be deduced by clients from the modification of the
    parent.
    
    Now clients are explicitly informed about removal of the detached
    recurrence in addition to the modification of the parent.
    (cherry picked from commit 571b77cdfad1788a9320ec29449c1e6a26f0c70b)

 calendar/backends/file/e-cal-backend-file.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

commit 67f78bfab9c893ced925e56cb0c51a9956b00d30
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 11:05:59 2011 +0200

    calendar file backend: removal notification for detached recurrence, part 1
    
    If e_cal_remove_object_with_mod() was called for an appointment where
    only a detached recurrence existed, no "objects-removed" signal was
    triggered although it should have been.
    
    Apparently Evolution avoids the problem by calling
    e_cal_remove_component() instead in this case. Fixing the problem
    makes writing clients easier (no special cases).
    
    With this patch, remove_instance() itself decides what it reports back
    to the caller. Note that it cannot report back both a modification and
    a removal at the moment.
    (cherry picked from commit 88c1996b6626e884b68dc98a76272827bc8680a0)

 calendar/backends/file/e-cal-backend-file.c |   56 ++++++++++++++++++---------
 1 files changed, 37 insertions(+), 19 deletions(-)

commit 72a9a2e3efeb4c572067d66b066fda90303d61cf
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 09:48:37 2011 +0200

    calendar file backend: white list check for supported CalObjModType
    
    Explicitly check that the CalObjModType is supported before
    starting to work on the appointment. Relies in libecal to reject
    completely bogus modes with an "invalid parameter" error.
    (cherry picked from commit bbe2d0a49089ee9f5522ce2749a009c730dd9079)

 calendar/backends/file/e-cal-backend-file.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

commit 0bfcafcf535db84f86b0f7d8e394494db897fb5f
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 09:36:59 2011 +0200

    libecal: catch invalid CalObjModType values
    
    This protects backends without their own parameter checking
    from being invoked with invalid CalObjModType values. Note
    that this only excludes values that haven't been defined.
    Backends still need to check whether they support the
    selected mode.
    (cherry picked from commit e6eb665600248a28bccf268be70d5d3ffcdadb62)

 calendar/libecal/e-cal.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

commit 58f0577d95784074924876ed494b0817ba1dffcd
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Thu May 12 09:29:16 2011 +0200

    libecal: added CALOBJ_MOD_ONLY_THIS
    
    The goal is to have an orthogonal API where each operation also
    has an inverse operation. Adding a detached recurrence was
    possible with e_cal_modify_object(), but removing it again
    wasn't without modifying the parent appointment.
    
    CALOBJ_MOD_ONLY_THIS in e_cal_remove_object_with_mod() provides
    that inverse operation by avoiding the modifications to the
    parent.
    
    The semantic in e_cal_modify_object(), the other call taking a
    CalObjModType, is unchanged. CALOBJ_MOD_ONLY_THIS is not valid there.
    
    Because not all backends reject CALOBJ_MOD_ONLY_THIS when they don't
    support it, a static capability CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS
    is added that must be checked first before using CALOBJ_MOD_ONLY_THIS.
    
    (Adapted from commit c54220339d9fda38d537e1f8cac3637403b362ab)

 calendar/libecal/e-cal-util.h              |    2 +
 calendar/libecal/e-cal.c                   |   42 +++++++++++++++++++++++----
 calendar/libedata-cal/e-cal-backend-sync.c |    2 +-
 3 files changed, 38 insertions(+), 8 deletions(-)

commit 9867e52e7372a830ec4056adb7ea6df848a83481
Author: Patrick Ohly <patrick.ohly@intel.com>
Date:   Wed May 11 16:59:51 2011 +0200

    calendar file backend: support removing parent event with CALOBJ_MOD_THIS
    
    It was possible to create a meeting series with just a detached event
    (RECURRENCE-ID set) by importing a meeting invitation for that single
    recurrence. It was not possible to arrive at that same state after
    adding the parent event (the one with the RRULE) because
    e_cal_remove_object_with_mod() removed all instances for
    CALOBJ_MOD_THIS and empty rid.
    
    This contradicts the intended semantic of e_cal_remove_object_with_mod():
     "By using a combination of the @uid, @rid and @mod
     arguments, you can remove specific instances. If what you want
     is to remove all instances, use e_cal_remove_object instead."
    
    This patch implements the desired semantic:
    - e_cal_backend_file_remove_object(CALOBJ_MOD_THIS) now always
      calls remove_instance().
    - remove_instance() was extended to also work for the parent
      event.
    - That call removes the complete object if nothing is left
      after removing the instance. This case must be handled by
      the caller. The return value is the original object (if
      it still exists) and NULL if not.
    - Because the uid pointer into the object may become invalid
      as part of the removal, a more permanent pointer has to
      be provided by the caller.
    (cherry picked from commit ba88feadc788ab9a2961afd6a3575d7079928c32)

 calendar/backends/file/e-cal-backend-file.c |  134 ++++++++++++++++++---------
 1 files changed, 88 insertions(+), 46 deletions(-)

commit 246fb4ca8d6836f97468c4a61e7a535ab771b805
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Mon Jun 6 16:48:42 2011 +0300

    e_book_backend_file_get_contact_list: Fix memory leak
    
    vcard_dbt.data should be freed if it is not appended to
    the contact list otherwise memory gets leaked.
    
    (Adapted from commit 4324e0125cbc23c81bd8f1dadcafdd945cf26eb1)

 addressbook/backends/file/e-book-backend-file.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 46db6a3212e60e3754f645e136bf0824438c047d
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Mon Jun 6 16:55:04 2011 +0300

    e_contact_name_from_string(): Fix possible memory leak
    
    The 'name' variable memory was leaked when name_str
    is NULL.
    (cherry picked from commit 6f17fe55e43d366eebd7f0bc7eeba0f3c56b3785)

 addressbook/libebook/e-contact.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit a178de88aae840d0fede477e2585be346f2b43e4
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Mon May 30 10:40:55 2011 +0300

    e_name_western_reorder_asshole: Fix possible memory leak
    
    Free 'prefix' variable on early return.
    (cherry picked from commit 5f75312bfd570a78575e8332f5f621e8c4b023d9)

 addressbook/libebook/e-name-western.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit c422b7050e5d009d3679cddcce479f9dacfbc803
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Mon May 30 14:43:14 2011 +0300

    e_dbhash_new: Close and reopen db handle to avoid memory leak
    
    According to the documentation, "If DB->open fails,
    the DB->close method should be called to discard the DB
    handle". The current code was calling open() again on
    the same handle without closing it it first, possibly
    causing memory leaks.
    
    This patch is adapted from commit
    37d3c0f65c989afe9ffc2d734d86b2ae0019edae in eds-fremantle GIT
    repository.
    (cherry picked from commit 6e0731c10801393d2bf1709ccff530df63bdbe28)

 libebackend/e-dbhash.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 5fd8caaa1b3b279ffac41e837dae0a1bcc2489cc
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Fri May 27 15:27:30 2011 +0200

    Bug #650950 - entry_compare() should iterate over attributes with the same name
    
    Extend entry_compare() to iterate over attributes that have
    the same name (e.g. X-HOBBY) so that it can match any of
    them, not just the first one in the vCard.
    (cherry picked from commit 16ebd8f3e9269f7b788fc093f0c7fd952732ac52)

 addressbook/libedata-book/e-book-backend-sexp.c |   25 +++++++++++++---------
 1 files changed, 15 insertions(+), 10 deletions(-)

commit 078224089b3afa09c6344ce6e5327756dc2b70b8
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Fri May 27 15:40:06 2011 +0200

    Bug #651113 - [libebook] Querying date fields is not supported
    (cherry picked from commit 37a3503b30cc071971a6806bd43d4a3bee949bb8)

 addressbook/libedata-book/e-book-backend-sexp.c |   33 ++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

commit 9b0bff12a98fac22aaa2bb79d0b27fda7bd4717e
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Fri May 27 15:37:35 2011 +0200

    Bug #651054 - Support queries based on "photo" contact field
    (cherry picked from commit ac16f4aeb1c146e89e709d0f0f5455275fbe62e8)

 addressbook/libedata-book/e-book-backend-sexp.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

commit 77ed61fb727d8ffdc456d88ecb74d8391a80f1e6
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Fri Jun 3 11:33:49 2011 +0200

    Bug #651226 - e_book_new_system_addressbook() should create source in GConf
    
    The same problem was fixed in libecal by commit 3bb75464a67
    and commit 05c0b7b4bd0.
    (cherry picked from commit 65a0f255464dc7d7b8f7f0aefeff1462f00d4475)

 addressbook/libebook/e-book.c |   74 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 71 insertions(+), 3 deletions(-)

commit cadf92b4fae4cb663d2869e9797b784722371212
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Fri May 27 15:30:39 2011 +0200

    Bug #650952 - Remove unknown EContact field name runtime warning
    (cherry picked from commit f700cef243672e64411e4ff28156930eace8b5af)

 addressbook/libebook/e-contact.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit c85a6bccc2412b357901386b671651a45fde74d4
Author: Christophe Dumez <christophe.dumez@intel.com>
Date:   Mon May 30 14:16:11 2011 +0300

    e_book_backend_file_get_changes: Fix possible memory leak
    
    Currently, only the list elements were freed. This patch
    makes sure the GLists are freed too.

 addressbook/backends/file/e-book-backend-file.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit 236c96932aba9966dbbbdf961e2ed73c474df452
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu May 26 17:01:32 2011 +0530

    CamelDB: Initiate a transaction before writing into db.

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

commit 49dcd30293a90571116d6d39c357c4fc14dfad51
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu Jun 2 15:41:34 2011 +0530

    Bug 640054 - CamelDB: do not read the db while a trasaction is in progress.
     Fix the dead-lock caused due to transaction (DB WRITE_LOCK) and summary lock.

 camel/camel-db.c             |   33 ++++++++++++++++++++++++++++-----
 camel/camel-folder-summary.c |   29 ++++++++++++++---------------
 2 files changed, 42 insertions(+), 20 deletions(-)

commit bddd76f8f8ec44e1da3d337a0ea141e5e497459c
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu May 26 13:39:30 2011 +0530

    CamelDB: Ensure that begin_transaction is called before adding queries to a transaction

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

commit bbac2010e9bfaa819f198f9771c412d219af6503
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu May 26 13:25:32 2011 +0530

    CamelFolderSummary: Remove undefined function camel_folder_summary_header_load from header file

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

commit 05dad4e0385a0f2d179e90dd89f72e950868b2ef
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu May 26 13:23:49 2011 +0530

    CamelDB: Use camel_db_select while retrieving the folder version

 camel/camel-db.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

commit 9ca324e9c5b89b982e40593d3afc97eb011ee832
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu Jun 2 15:38:46 2011 +0530

    CamelDB: use a RW lock to prevent reads while write is in progress

 camel/camel-db.c    |  136 +++++++++++++++++++-------------------------------
 camel/camel-db.h    |    2 +
 camel/camel-store.c |    8 +--
 3 files changed, 56 insertions(+), 90 deletions(-)

commit 70466da417cf26ce0580f985002aaacaaddf63fb
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jun 2 09:31:22 2011 +0200

    Bug #640083 - Force secured connection when using LDAPS port

 addressbook/backends/ldap/e-book-backend-ldap.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 308219751a6874a468c53334c70466f20e36c641
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   Sun May 29 13:59:40 2011 +0200

    [l10n]Updated Catalan (Valencian) translation

 po/ca@valencia.po | 3028 +++++++++++++++++++++++++++--------------------------
 1 files changed, 1560 insertions(+), 1468 deletions(-)

commit b569a3f9cd882f1e1c5b08bdff23b1bcb74572b0
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu May 26 11:11:41 2011 +0200

    Bug #589495 - Search folder by Size (KB) counts bytes, not KB

 camel/camel-search-sql-sexp.c |    3 ++-
 camel/camel-search-sql.c      |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 3242a043b900e531bbb914c4d510d9f4a7f00682