commit ad8afd014f7a510cb34c450aca10416a66d23bea
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 15 19:14:53 2012 -0400

    NEWS update for 3.5.4 release.

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

commit d88c38abebb672977729735513135da8b47409d4
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 15 17:17:11 2012 -0400

    Rework handling of GOA mail.
    
    Disabling the mail part of an online account through the Control Center
    panel will now remove the CamelService from the EMailSession in addition
    to disabling the account/identity/transport ESources, causing it to be
    delisted from the account list in Preferences.
    
    Furthermore, hide the Enabled check box for accounts linked to GOA in
    Preferences.  The collection ESource for these accounts can no longer
    be disabled through Evolution; all such account manipulation must be
    done through the Control Center panel.
    
    Lastly, display an icon next to accounts linked to GOA in Preferences.
    
    * Might be nice to show the actual provider icon instead of the generic
      Online Accounts icon from the Control Center, but need to think about
      how best to do that.  Don't want a GOA dependency in core Evolution.
      Maybe ESourceCollection should grow a GIcon property for the online-
      accounts module in the registry service to set?

 libemail-engine/e-mail-session.c |   84 ++++++++++++++++++++++++++++++++++++++
 mail/e-mail-account-store.c      |   16 +++++++
 mail/e-mail-account-store.h      |    2 +
 mail/e-mail-account-tree-view.c  |   20 +++++++++-
 4 files changed, 121 insertions(+), 1 deletions(-)

commit fcca366ecce1ffddaf6a280e248456127def1b4d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 15 16:08:41 2012 -0400

    mail_session_add_service(): Make display-name binding one-way.
    
    We're leaking CamelService references when we remove a CamelService
    from a CamelSession.  I don't yet know where or how.
    
    If we remove a CamelService without finalizing the corresponding ESource,
    and then add a new CamelService with the same UID, the ESource will have
    a bidirectional "display-name" binding to multiple CamelService instances.
    This creates an endless cascade of "notify" signals as soon as any of the
    bound "display-name" properties change.
    
    Until I can fix the leaking CamelService references, make the binding
    one-way: ESource -> CamelService.  This means the ESource's display name
    is authoritative, and camel_service_set_display_name() MUST NOT be called
    explicitly or else it will become out-of-sync with the ESource.

 libemail-engine/e-mail-session.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit a1d2eb47189ccc2109d3080505de4a0319d2f18c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 15 14:46:40 2012 -0400

    EMailAccountStore: Check permissions before writing/removing sources.

 mail/e-mail-account-store.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit fe2961aa501364ac45c2ded6834d312112818073
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 15 11:05:06 2012 -0400

    mail_session_add_from_source(): Warn if backend name is unset.
    
    Even send-only accounts should have a backend name of "none".

 libemail-engine/e-mail-session.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

commit 55a033036524b7c19c0733a74edfaccceaf1f11f
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Sun Jul 15 10:34:57 2012 +0300

    Updated Belarusian translation.

 po/be.po | 4225 ++++++++++++++++++++++----------------------------------------
 1 files changed, 1487 insertions(+), 2738 deletions(-)

commit dbe56d343815dd71f8cd8da425a5d1f3b75fe6d2
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Fri Jul 13 18:39:33 2012 +0200

    Updated POTFILES.in

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 76bc1fd79fd350a7bdea0bcd93c986e101918225
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 13 14:23:17 2012 +0200

    Bug #678783 - Crash under e_attachment_set_file_info()

 widgets/misc/e-attachment.c |   53 ++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 20 deletions(-)

commit 3a3a788041a1d8aa5e961b77919ea88ed32e635e
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 13 13:36:05 2012 +0200

    Bug #653529 - Alarm Notification window events list is too small

 calendar/alarm-notify/alarm-notify.ui |  606 +++++++++++++++++----------------
 calendar/alarm-notify/alarm-queue.c   |    1 +
 2 files changed, 319 insertions(+), 288 deletions(-)

commit 79f40c3cacc31d1975fff4c3143ce93dc0035179
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Jul 13 13:34:37 2012 +0200

    Make alarm notifications work again

 calendar/alarm-notify/alarm-notify.c |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

commit db348eb976a071c5464d18ddc4a40be8edba5a8c
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Fri Jul 13 10:59:41 2012 +0200

    Bug 679726 - Can't unfold long recipient list in message window

 mail/e-mail-display.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

commit 41d72be8b460daf191d1ec1d29f84618694da7ac
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Fri Jul 13 10:55:56 2012 +0200

    Bug 679814 - Calendar invitation shows both calendar and html part

 modules/prefer-plain/e-mail-parser-prefer-plain.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit bd2af6d508bee034e7251e5171eff28427ce1546
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Fri Jul 13 10:55:12 2012 +0200

    Bug 679323 - Formatting errors when replying in inline mode

 em-format/e-mail-formatter-quote-headers.c |  137 +++++++++++++++++++++++++++-
 1 files changed, 134 insertions(+), 3 deletions(-)

commit 759741ebd64a2c7c4953214d7790c3dad3de031e
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Thu Jul 12 17:10:44 2012 +0200

    Don't display SMIME signature as an attachment

 em-format/e-mail-parser-application-smime.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 9ac3461e48c7d747f36b73d08ace5f2bccda052a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 12 10:24:01 2012 -0400

    Fix a slight memory leak.

 mail/mail-send-recv.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

commit 43c8c058a9449363d20470cb10889147a4613632
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 12 10:21:44 2012 -0400

    Bug 332115 - Remove Camel module names from Send/Receive window

 mail/mail-send-recv.c |   41 ++++++++++++++---------------------------
 1 files changed, 14 insertions(+), 27 deletions(-)

commit 03009ee631b98e9a9f9360e0853d05572fc8b36a
Author: Giovanni Campagna <gcampagna@src.gnome.org>
Date:   Tue Jun 26 01:32:55 2012 +0200

    Update to libgweather 3.5
    
    libgweather 3.5.0 changed API compared to API, and some small
    changes are needed in the configuration widgets.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678984

 configure.ac                                       |    7 +--
 .../evolution-cal-config-weather.c                 |   85 +++++---------------
 2 files changed, 22 insertions(+), 70 deletions(-)

commit f63f758398bd2867301e9dd8491c05c9329835d3
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jul 11 18:32:24 2012 +0200

    Bug #349875 - Dragging an email from a vFolder should link to source folder

 mail/em-utils.c |  116 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 90 insertions(+), 26 deletions(-)

commit 0c881254de455c77032b24d419bdabe7a4b5adfd
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jul 11 16:38:27 2012 +0200

    Bug #223309 - Add "Include Subfolders" to "Search Folder Sources"

 libemail-engine/mail-vfolder.c   |  245 ++++++++++++++++++++++++++------------
 libemail-utils/em-vfolder-rule.c |   93 +++++++++++++--
 libemail-utils/em-vfolder-rule.h |   12 ++-
 mail/em-vfolder-editor-rule.c    |   76 +++++++++++--
 mail/mail-vfolder-ui.c           |   13 ++-
 5 files changed, 340 insertions(+), 99 deletions(-)

commit 1852490a930c625a5fb300069694d661e3eeed02
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jul 11 12:37:12 2012 +0200

    Preset timeout on SoupSession-s to 90 seconds

 calendar/gui/e-meeting-store.c               |    1 +
 calendar/gui/itip-utils.c                    |    1 +
 mail/e-http-request.c                        |    4 +++-
 modules/cal-config-caldav/e-caldav-chooser.c |    2 ++
 4 files changed, 7 insertions(+), 1 deletions(-)

commit 5183108e3bbcfc1b23a2d5c2b67d3f41000c5e32
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 10 12:25:55 2012 -0400

    EMailConfigProviderPage: Inherit from EMailConfigActivityPage.
    
    Removes e_mail_config_provider_page_new_activity().
    
    Use e_mail_config_activity_page_new_activity() instead.

 mail/e-mail-config-provider-page.c |  115 +-----------------------------------
 mail/e-mail-config-provider-page.h |   10 ++-
 2 files changed, 7 insertions(+), 118 deletions(-)

commit a0b99778009d62407484f288884f5942ef85b2d5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 10 11:09:58 2012 -0400

    EMailConfigServicePage: Inherit from EMailConfigActivityPage.
    
    Removes e_mail_config_service_page_new_activity().
    
    Use e_mail_config_activity_page_new_activity() instead.

 mail/e-mail-config-auth-check.c   |    3 +-
 mail/e-mail-config-service-page.c |  118 ++-----------------------------------
 mail/e-mail-config-service-page.h |    9 +--
 3 files changed, 10 insertions(+), 120 deletions(-)

commit ad10fa252667daba4f31e10096b4a8a838a41cba
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 10 11:00:29 2012 -0400

    Add EMailConfigActivityPage.
    
    This is a convenient base class for EMailConfigPages that might need
    to run an asynchronous method and display an error message.  It adds
    activity and alert bars to the bottom of the page, it implements the
    EAlertSink interface, and can create new EActivity instances.

 mail/Makefile.am                   |    2 +
 mail/e-mail-config-activity-page.c |  178 ++++++++++++++++++++++++++++++++++++
 mail/e-mail-config-activity-page.h |   72 +++++++++++++++
 3 files changed, 252 insertions(+), 0 deletions(-)

commit 20973f9281767871e8db287cf55aceae7f68b6df
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 19:21:28 2012 +0200

    Bug #548778 - Use original location when replying in Search Folder

 libemail-engine/e-mail-session.c   |    2 +-
 libemail-engine/e-mail-utils.c     |   39 +++++++++++++++++++++++++----------
 libemail-engine/e-mail-utils.h     |   12 +++++++---
 mail/em-composer-utils.c           |    4 +-
 modules/itip-formatter/itip-view.c |    2 +-
 modules/mdn/evolution-mdn.c        |    4 +-
 6 files changed, 42 insertions(+), 21 deletions(-)

commit 8ca9931144651903d7ecb01b6f0dc694b0ae9f77
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 18:21:34 2012 +0200

    Bug #677695 - Freeze on quit in emu_free_mail_cache()

 libemail-engine/e-mail-utils.c |  109 +++++++++++++++++++++++++++++++++-------
 1 files changed, 91 insertions(+), 18 deletions(-)

commit a3bd7ff42fe0e2be150cfad7640a5e8d62d8821b
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 17:01:12 2012 +0200

    Add "auto-update" option to Search Folder Editor

 libemail-engine/mail-vfolder.c   |   34 ++++++-------
 libemail-utils/em-vfolder-rule.c |   98 +++++++++++++++++++++++++++++---------
 libemail-utils/em-vfolder-rule.h |   11 +++-
 mail/em-vfolder-editor-rule.c    |   25 +++++++++-
 4 files changed, 121 insertions(+), 47 deletions(-)

commit 0163eacc4ac1826a53cfdd4adac9f7a5fa139890
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Jul 10 15:57:19 2012 +0200

    Updated Norwegian nynorsk translation

 po/nn.po |36901 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 17109 insertions(+), 19792 deletions(-)

commit 8e5ed2e6458bf04d81c2a355f20a4b80f91548c8
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 14:59:21 2012 +0200

    Avoid crash on folder rename

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

commit 114d0574dbc30dabd26b858834a3d891160da0da
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 14:12:25 2012 +0200

    Do not show cancelled errors from refresh_folders_exec()

 mail/mail-send-recv.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 82e980001bdbc20996985f1ec33b968cd133d677
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jul 10 10:55:16 2012 +0200

    Always notify about finished updated_folders() call

 libemail-engine/mail-folder-cache.c |   13 +++++--------
 mail/mail-send-recv.c               |   13 +++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

commit c14ebe73581fba5afa527c188507d1d50b2ebdd7
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 19:53:52 2012 -0400

    Bug 679649 - Remove "Recent Messages" from Quick Search Bar
    
    The story on this is a question [1] was recently posed to the mailing
    list about what's the different between "Recent Messages" and "Last 5
    Days' Messages" as listed in the Show: combo box, and even I could not
    answer before looking up the query expression for "Recent Messages" in
    the source code (messages received in the past 24 hours, it turns out).
    
    I can't defend why we need both options, and "Last 5 Days' Messages"
    is less ambiguous and overlaps the results for "Recent Messages", so
    "Last 5 Days' Messages" seems sufficient to me.  There are  numerous
    ways to re-create the "Recent Messages" query if it's still desired:
    saved search, search folder, or just sort messages by date received.
    
    [1] https://mail.gnome.org/archives/evolution-list/2012-July/msg00044.html

 modules/mail/e-mail-shell-view-actions.c |    7 -------
 modules/mail/e-mail-shell-view-actions.h |    2 --
 modules/mail/e-mail-shell-view-private.h |    9 ++++-----
 modules/mail/e-mail-shell-view.c         |   17 -----------------
 4 files changed, 4 insertions(+), 31 deletions(-)

commit 55098b935c6e860424419dfd5f51a822dd8b418b
Author: Andre Klapper <a9016009@gmx.de>
Date:   Mon Jul 9 20:14:33 2012 +0200

    User Docs: Use better Mallard markup

 help/C/mail-filters-not-working.page |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 07767d7991444df1cf1c2cfed6692edf3282b924
Author: Andre Klapper <a9016009@gmx.de>
Date:   Mon Jul 9 20:11:19 2012 +0200

    Document logging mail filter actions. Fixes bug #669471

 help/C/mail-filters-not-working.page |   43 +++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 11 deletions(-)

commit 69e55b253eea402a16fbbb35f0e074945007c68e
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 9 16:43:48 2012 +0200

    Bug #602425 - Search in "Current Account"/"All Accounts" depends on vfolders

 modules/mail/e-mail-shell-view.c |  205 +++++++++++++++++++-------------------
 1 files changed, 103 insertions(+), 102 deletions(-)

commit 175f43e240dea1a263204d18d116cffd40914eff
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Jul 9 16:12:39 2012 +0200

    Updated Galician translations

 po/gl.po | 1356 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 699 insertions(+), 657 deletions(-)

commit 3afa4cdd9553e1b9a0e8a8da1cfa73d13ca7c78c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 07:47:08 2012 -0400

    Remove em_folder_tree_get_selected_folder().
    
    The function blocks, lacks a "sync" suffix and GCancellable and GError
    arguments.  Not fit for use.  Kill it.

 mail/em-folder-tree.c |   22 ----------------------
 mail/em-folder-tree.h |    2 --
 2 files changed, 0 insertions(+), 24 deletions(-)

commit a0bc647f07e097edf87b89341225710b5be40208
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 07:43:16 2012 -0400

    Remove mail_expunge_folder().
    
    Use e_mail_folder_expunge() instead.

 libemail-engine/mail-ops.c               |  286 +-----------------------------
 libemail-engine/mail-ops.h               |    1 -
 modules/mail/e-mail-shell-view-actions.c |   39 ++---
 3 files changed, 23 insertions(+), 303 deletions(-)

commit b3d0f3d8ea8691c48e4edfc0436ed43ca12f6ea5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 07:21:42 2012 -0400

    Add e_mail_reader_expunge_folder_name().
    
    Fetches the CamelFolder asynchronously, then expunges it asynchronously.

 mail/e-mail-reader-utils.c |   67 ++++++++++++++++++++++++++++++++++++++++++++
 mail/e-mail-reader-utils.h |    4 ++
 2 files changed, 71 insertions(+), 0 deletions(-)

commit 0a359ba9826d52378e64e4a9a9c96588255a1ad9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 07:13:07 2012 -0400

    Add e_mail_reader_expunge_folder().
    
    Wraps e_mail_folder_expunge() with EActivity/EAlert stuff and also
    prompt for confirmation.

 mail/e-mail-reader-utils.c |   70 ++++++++++++++++++++++++++++++++++++++++++++
 mail/e-mail-reader-utils.h |    2 +
 mail/mail.error.xml        |    5 +++
 3 files changed, 77 insertions(+), 0 deletions(-)

commit c44c65e85fe6413b69d26ae600be6bfb4952367c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 9 07:34:31 2012 -0400

    Add e_mail_folder_expunge().
    
    To replace mail_expunge_folder().

 libemail-engine/e-mail-folder-utils.c |  285 +++++++++++++++++++++++++++++++++
 libemail-engine/e-mail-folder-utils.h |   12 ++
 2 files changed, 297 insertions(+), 0 deletions(-)

commit 07857224789b165e69bb170d364c9c13366fa952
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 16:05:49 2012 -0400

    Use folder display name in status messages when possible.

 libemail-engine/e-mail-folder-utils.c |   10 ++++++----
 mail/importers/mail-importer.c        |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

commit 5bd9b582903a1bd949ade4b0a46e8a8b9b116561
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 15:06:05 2012 -0400

    Remove mail_refresh_folder().
    
    Use e_mail_reader_refresh_folder() instead.

 libemail-engine/mail-ops.c               |   44 ------------------------------
 libemail-engine/mail-ops.h               |    4 ---
 mail/e-mail-paned-view.c                 |    2 +-
 modules/mail/e-mail-shell-view-actions.c |   22 ++++++++++++---
 4 files changed, 19 insertions(+), 53 deletions(-)

commit a7bab4dcafe4ecb2e838c330f9b1777e641c7d14
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 14:57:37 2012 -0400

    Add e_mail_reader_refresh_folder_name().
    
    Fetches the CamelFolder asynchronously, then refreshes it asynchronously.

 mail/e-mail-reader-utils.c |   67 ++++++++++++++++++++++++++++++++++++++++++++
 mail/e-mail-reader-utils.h |    4 ++
 2 files changed, 71 insertions(+), 0 deletions(-)

commit 84cfc5b80c4d3845b41358d68e33383c2c66a566
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 14:16:27 2012 -0400

    Add e_mail_reader_refresh_folder().
    
    To replace mail_refresh_folder().

 mail/e-mail-reader-utils.c |   57 ++++++++++++++++++++++++++++++++++++++++++++
 mail/e-mail-reader-utils.h |    2 +
 mail/mail.error.xml        |    5 ++++
 3 files changed, 64 insertions(+), 0 deletions(-)

commit 9c797884816c948ead7eb93070d639498f321bd4
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 12:43:41 2012 -0400

    Add e_mail_reader_unsubscribe_folder_name().
    
    Replaces e_mail_session_unsubscribe_folder().

 libemail-engine/e-mail-session-utils.c   |  107 ------------------------------
 libemail-engine/e-mail-session-utils.h   |   16 -----
 mail/e-mail-reader-utils.c               |   64 ++++++++++++++++++
 mail/e-mail-reader-utils.h               |    4 +
 mail/mail.error.xml                      |    4 +-
 modules/mail/e-mail-shell-view-actions.c |   79 +++++-----------------
 6 files changed, 86 insertions(+), 188 deletions(-)

commit 451afa8429b6ff074d8d0aa93d18e1f5043627ea
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 11:45:03 2012 -0400

    Add e_mail_reader_delete_folder_name().
    
    Fetches the CamelFolder asynchronously, then deletes it asynchronously.

 mail/e-mail-reader-utils.c               |   72 ++++++++++++++++++++++++++++++
 mail/e-mail-reader-utils.h               |    4 ++
 modules/mail/e-mail-shell-view-actions.c |   17 +++++--
 3 files changed, 89 insertions(+), 4 deletions(-)

commit acac6795d927185fec36dae65ee4c74e8165152c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 8 10:18:05 2012 -0400

    Avoid em_folder_tree_get_selected_folder() in some places.
    
    em_folder_tree_get_selected_folder() currently blocks, and I'm about to
    remove the function.  But there's a couple places where we just need to
    block for now, else it would require a significant rewrite.  So execute
    the em_folder_tree_get_selected_folder() logic manually in those places.

 mail/message-list.c              |   36 ++++++++++++++++++++++++++++++------
 modules/mail/e-mail-shell-view.c |   22 ++++++++++++++++++++--
 2 files changed, 50 insertions(+), 8 deletions(-)

commit ec1e0144581bd14d1993b7bf0a1e423d2092f463
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 9 14:32:25 2012 +0200

    Bug #524737 - Replace radio buttons in Search folder editor

 mail/em-vfolder-editor-rule.c |  185 +++++++++++++++++++++---------------
 mail/mail-dialogs.ui          |  211 -----------------------------------------
 2 files changed, 108 insertions(+), 288 deletions(-)

commit 9b3789fa9a0135018cb1bd7024f08116e4ff2ef4
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 9 13:58:18 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 1388 ++++----------------------------------------------------------
 1 files changed, 81 insertions(+), 1307 deletions(-)

commit 13c2060cb1bb1cef2838906b9c3fb2d9d6abec3f
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:   Mon Jul 9 19:19:19 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |19852 +++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |20378 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 20301 insertions(+), 19929 deletions(-)

commit c85183f69655717cff93a0e233c291ec58be8183
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 9 10:09:49 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po |13179 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 6467 insertions(+), 6712 deletions(-)

commit 3908410235236bb2c6f26ea938ebf08b0d8a2bac
Author: Andre Klapper <a9016009@gmx.de>
Date:   Sun Jul 8 19:28:23 2012 +0200

    User Help: Add tint2 as system tray option as mentioned on evolution-list

 help/C/minimize-to-system-tray.page |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 3ade9a67e9af31f89b707040ce89b6e20bfbdfd1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 7 08:37:19 2012 -0400

    e_web_view_update_fonts(): Fix memory corruption.
    
    Boxed GdkColors are allocated with the slice allocator, not malloc().
    
    This has been causing me frequent and random Evolution crashes.

 widgets/misc/e-web-view.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

commit 9e270dd4ed8d7da9dbb517220c2352ce3c651635
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 7 08:22:44 2012 -0400

    Bug 677885 - Deleting account is chatty on console

 mail/e-mail-account-store.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit 73a55d4cc53e7c679f410dab3a79469ad1b78e5c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 7 07:16:17 2012 -0400

    Bug 678606 - Crash under mail_backend_folder_deleted_cb()

 mail/e-mail-backend.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit bd6c394e0cdddfcf4c3742fe93531a6d259a962c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sat Jul 7 13:12:06 2012 +0200

    Updated Spanish translation

 po/es.po |  169 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 89 insertions(+), 80 deletions(-)

commit 5c53935ab2b5695283819297f11d4586425e9c0a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 6 22:14:20 2012 -0400

    Adapt to CamelStore API change.
    
    compare_folder_name() -> equal_folder_name()

 libemail-engine/e-mail-folder-utils.c |    4 ++--
 mail/e-mail-backend.c                 |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 8bead3f14e583c760947abd6c0c87d4c70516033
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 6 22:12:47 2012 -0400

    Fix an unused variable warning.

 mail/e-mail-ui-session.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 749b49e5079aaaf171a282f33deb0b12818ba11d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 6 15:34:39 2012 -0400

    Disconnect a CamelService after editing its settings.
    
    This will force Evolution to reconnect to the service using the current
    settings.  However this is not a complete solution.  If the new settings
    now point to a completely different mail account, we leave behind cached
    messages and database tables from the previous account such that you end
    up with some weird hybrid of the previous account and current account.
    
    I guess for now the answer is "don't do that", but we should try to
    handle that more gracefully in the future -- more for architectural
    correctness than it being a common real world use case.

 mail/mail.error.xml                 |    5 ++
 modules/mail/e-mail-shell-backend.c |   82 +++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 0 deletions(-)

commit 8eae40f7e895782fae19d289090edbb102b01bfd
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 6 11:42:06 2012 -0400

    EMailConfigWindow: Add a "changes-committed" signal.
    
    Emitted after all changes are successfully committed over D-Bus.
    
    Can connect to this signal to perform followup actions, such as
    disconnecting the corresponding CamelService.

 mail/e-mail-config-window.c |   17 +++++++++++++++++
 mail/e-mail-config-window.h |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)

commit 09e374bfc606916a840e9eb9809d33e6ac5359eb
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 6 12:09:37 2012 -0400

    Remove mail_ui_session_source_changed_cb().
    
    This function removed a CamelStore from EMFolderTreeModel and then added
    it again in response to the corresponding ESource emitting a "changed"
    signal (presumably from editing a mail account and saving changes).
    
    In the past this was the only way for changes to the account URI string
    to take effect without restarting Evolution.  But we have CamelSettings
    now and don't need this hack anymore.  Time for it to die.

 mail/e-mail-ui-session.c |   69 ----------------------------------------------
 1 files changed, 0 insertions(+), 69 deletions(-)

commit 64f9b68adbbb668956205a1c345d7664b68af4e8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Jul 6 12:24:24 2012 +0200

    Updated Spanish translation

 po/es.po |  390 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 200 insertions(+), 190 deletions(-)

commit e57a4bb617b0b1f61c64026d1a343b14c8ed2c4e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 5 09:02:05 2012 -0400

    Fix error XML definitions with one button.
    
    Don't need an "OK" button because EAlert already adds an [X] button to
    dismiss the alert.  So we wind up seeing [ OK ] [X], which looks silly.

 addressbook/addressbook.error.xml |    1 -
 calendar/calendar.error.xml       |   10 ----------
 2 files changed, 0 insertions(+), 11 deletions(-)

commit 6a8a66986dd13625f2620047b8f62f299947f2e8
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Jul 4 17:18:22 2012 -0400

    Bug 678946 - Port entry in Account Assistant is unset
    
    Reverts part of commit 6c05b09be16ac8eceb17653c3c26c0c6f963ef10.

 widgets/misc/e-port-entry.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit a0957f73f6dace58be61edc5e01f0ec0d27be90f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 18:42:16 2012 -0400

    Delay saving Evolution version until later in initialization.
    
    Save the version after the startup wizard has had a chance to
    run.  If the user chooses to restore data and settings from a
    backup, Evolution will restart and the restored data may need
    to be migrated.
    
    If we save the version before the restart, then Evolution will
    think it has already migrated data and settings to the current
    version and the restored data may not be handled properly.

 shell/e-shell-migrate.c |   82 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 14 deletions(-)

commit cf5191f317bafeaaceb6dd3987d516d03a6e774e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 15:14:29 2012 -0400

    Remove evolution-nognome script.
    
    Looks like some ancient development environment script.
    
    I actually use something very similar for my own development
    environment, but it doesn't belong in a version control system.

 configure.ac               |    1 -
 shell/Makefile.am          |    3 ---
 shell/evolution-nognome.in |   13 -------------
 3 files changed, 0 insertions(+), 17 deletions(-)

commit 6cda29281f23dbf2ceff713a40c08415266d3c98
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 13:27:06 2012 -0400

    Record the actual Evolution version after migration.
    
    Not the next stable version.  If migration needs to occur multiple times
    during a development cycle for different reasons, we'll need an accurate
    last-used-version stamp.

 configure.ac            |    5 +++++
 shell/Makefile.am       |    9 ++++++++-
 shell/e-shell-migrate.c |   16 +++++++---------
 shell/evo-version.h.in  |   30 ++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 10 deletions(-)

commit 34eeda37d39f37fc88fa93dd7a890424fbcf6d3d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 12:25:24 2012 -0400

    Remove UPGRADE_REVISION definition.
    
    This is always '0'.
    
    I've never changed it to anything else so it's a useless definition.

 configure.ac            |    7 -------
 shell/e-shell-migrate.c |    8 +++-----
 2 files changed, 3 insertions(+), 12 deletions(-)

commit 56333d439bb9bf225d413a6308d2077288207315
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 2 18:32:00 2012 +0200

    Bug #677604 - Critical warnings on evolution start

 libemail-engine/e-mail-session.c |    5 ++++-
 mail/e-mail-ui-session.c         |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

commit 8b7bd45b7cfcfa5c7002d88a933758c78661d1b4
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 2 18:08:52 2012 +0200

    Bug #246231 - Add Filter Rule dialog - UI suggestions

 filter/e-filter-rule.c |   77 +++++++++++++++++++++++++-----------------------
 mail/em-filter-rule.c  |   32 ++++++++++----------
 2 files changed, 56 insertions(+), 53 deletions(-)

commit 62a4fb09124725720aa1bd5d46f594786df92c6f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 11:52:01 2012 -0400

    Remove "last-upgraded-version" GSettings key.
    
    AFAICT, this key does nothing useful and only confuses me every time I
    read the EShell migration code.
    
    The "version" key records the most recently used Evolution version.
    That's all we need for migration.  And since downgrading Evolution is
    not supported, we can assume this value will only increase over time.

 data/evolution.convert                  |    1 -
 data/org.gnome.evolution.gschema.xml.in |    9 ++-------
 shell/e-shell-migrate.c                 |   19 -------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

commit 05724f4273c8b76ce3b2bd98def409de7e6d107e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 11:18:01 2012 -0400

    killev.c: Don't kill D-Bus services.
    
    Evolution is no longer a privileged D-Bus client.  Only terminate
    Evolution, not the D-Bus services that other clients may be using.

 shell/killev.c |   61 +++++++++++++++++++++++---------------------------------
 1 files changed, 25 insertions(+), 36 deletions(-)

commit ae1f880dd8b49003a8c0ec51e977bad5bc6d5329
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 2 10:45:58 2012 -0400

    Trust attachments from ~/.kde and ~/.kde4.
    
    This came about from a mailing list thread entitled:
    
       Sending photos from digKam: "Skipping suspicious attachment"
    
    Apparently KDE still uses dot-folders quite heavily, despite having
    helped draft the XDG Base Directory Specification.

 composer/e-msg-composer.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit 90b80d173ff72c1d4a7a92dd2563b20866eb9ff1
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Jul 2 16:45:19 2012 +0200

    Bug #661886 - Avoid vertical scrolling in the filtering rules editor

 filter/e-filter-rule.c        |  153 ++++++++++++++++++++++++++++++-----------
 mail/em-filter-rule.c         |  103 +++++++++++++++++++++++-----
 mail/em-vfolder-editor-rule.c |    4 +-
 3 files changed, 201 insertions(+), 59 deletions(-)

commit 75bebad7f6d82e4a66695dcf77d46f91b973306c
Author: Sasi Bhushan Boddepalli <sasi@swecha.net>
Date:   Fri Jun 29 15:52:18 2012 +0530

    Updated Telugu Translation

 po/te.po |18825 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 9357 insertions(+), 9468 deletions(-)

commit 012e391d8140764647522f91c81b1a333299ee5a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu Jun 28 13:15:39 2012 +0200

    Updated Spanish translation

 po/es.po |  824 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 420 insertions(+), 404 deletions(-)

commit ff566c8be00db72e012f19fb0402d7e4fd74ab2b
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Jun 28 10:53:08 2012 +0200

    Fix compiler warning

 modules/prefer-plain/e-mail-parser-prefer-plain.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 437864081558dca587277ce6636ca0e4e16ca15a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jun 28 01:50:03 2012 -0400

    prefer-plain: Add missing linker flags.

 modules/prefer-plain/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit e5eb699ce36f57891cbe255a8f4054ab6fc6acbd
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jun 27 20:17:28 2012 +0200

    Fix few memory leaks

 mail/message-list.c                 |   13 +++++++------
 modules/mail/e-mail-shell-sidebar.c |    2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

commit 9cdae1a4cc9b5c0879c61eeee351036540fc473c
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Jun 27 19:09:51 2012 +0200

    Bug #257283 - Can't select multiple folders at once in vFolder sources

 mail/em-vfolder-editor-rule.c |  170 +++++++++++++++++++++++++++--------------
 mail/mail-dialogs.ui          |    2 +-
 2 files changed, 112 insertions(+), 60 deletions(-)

commit 0da915da8d8a1d2d584fe905bb4673c25db14fb9
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 19:06:03 2012 +0200

    Cancel scheduled EMailDisplay reload in _dispose()

 mail/e-mail-display.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

commit 8de1c927dfbc915ba1aa1157aa62a54a7824fbfa
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 18:04:52 2012 +0200

    Don't load images in preview pane when openning Preferences Dialog
    
    Openning the Preferences dialog for the first time causes many
    property bindings to be created. GLib emits a lot of ::notify signals
    during this, one of them being about image-loading-policy.
    
    We now correctly check, whether the change was to allow loading
    images, or not (and we don't display them in that case).
    
    Finaly, e_mail_display_reload() will always schedule the action via
    g_idle_add() so that we can merge plenty of _reload() calls caused by
    the afformentioned ::notify emitions into single call when all the noise
    is over.

 mail/e-mail-display.c |   79 +++++++++++++++++++++++++-----------------------
 1 files changed, 41 insertions(+), 38 deletions(-)

commit 20ec9d7c1fdecce39a75fdab50814a6af0ae9b86
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 14:13:02 2012 +0200

    Bug #678834 - [prefer-plain] Setting change works only after restart

 em-format/e-mail-part-list.c |   31 -------------------------------
 em-format/e-mail-part-list.h |    4 ----
 mail/e-mail-reader-utils.c   |    3 +--
 3 files changed, 1 insertions(+), 37 deletions(-)

commit f77a83e8759912bc74029e29effe1f0d20876965
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 14:08:03 2012 +0200

    Display local contact photos in EContactEditor's EImageChooser
    
    Some contacts have photos stored locally as files. Until now
    EContactEditor displayed thumbnail of contact photo in EImageChooser
    only if the photo was embedded in the vCard as data. This patch
    adds support for dispalying thumbnails of photos stored in local files
    to indicate that the contact has a picture set.

 addressbook/gui/contact-editor/e-contact-editor.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

commit 2a86155e711e620bcfb1bb3dcfe1782991f0dc5c
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 14:03:54 2012 +0200

    Bug #674427 - Crash when formatting contact in addressbook

 addressbook/gui/widgets/eab-contact-display.c   |   51 ++++++++++++----------
 addressbook/gui/widgets/eab-contact-formatter.c |   11 +++++
 addressbook/gui/widgets/eab-contact-formatter.h |    4 ++
 3 files changed, 43 insertions(+), 23 deletions(-)

commit 255e0529040baae67e3d70f1030ce248fd61856d
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 13:50:54 2012 +0200

    Fix displaying photos in contacts preview
    
    EContactPhoto URIs are already escaped, but WebKit escapes it again, so images
    are not displayed sometimes. Unescaping the URI before writing it to the HTML
    fixes to problem.

 addressbook/gui/widgets/eab-contact-formatter.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit de86ffdd180f66c0727e189ededbd40fe8436bd7
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed Jun 27 14:06:14 2012 +0200

    Updated POTFILES.in

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6d0b910524fea49fcd9b39053982c4bd8fec0c85
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 13:16:43 2012 +0200

    Display text/plain in fixed-width font
    
    Regression from commit 99a875ed

 em-format/e-mail-formatter-text-plain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ca9dfde2c30a211d8760064c541f368def4f1fe6
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Jun 27 11:04:32 2012 +0200

    Add CamelDebug to e_mail_parser_parse_sync

 em-format/e-mail-parser.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

commit 5f0c5122552e19a4989f5961151b52cd72daf047
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jun 26 16:54:11 2012 +0200

    Bug #677993 - Remember screen used in previous session

 e-util/e-util.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

commit 2992ba8de93a8d57c48fbf77549ddcab6d49bccd
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Tue Jun 26 15:12:23 2012 +0200

    [prefer-plain] Fix displaying suppressed HTML parts
    
    Fix regression from commit 99a875ed which has broken displaying
    of suppressed HTML parts as attachments when the HTML part is embedded
    in a multipart/* container.

 modules/prefer-plain/e-mail-parser-prefer-plain.c |   41 +++++++++++----------
 1 files changed, 21 insertions(+), 20 deletions(-)

commit 99a875edae6c57fd6540818d3f0da994b135a068
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Tue Jun 26 13:39:47 2012 +0200

    Bug #515004 - Allow toggling between text and HTML view of mail

 data/webview.css                                   |    4 +-
 em-format/e-mail-formatter-text-html.c             |    3 +-
 em-format/e-mail-formatter-text-plain.c            |   26 +-
 mail/Makefile.am                                   |    2 +
 mail/e-mail-display-popup-extension.c              |   55 +++
 mail/e-mail-display-popup-extension.h              |   64 ++++
 mail/e-mail-display.c                              |   78 +++--
 modules/prefer-plain/Makefile.am                   |    2 +
 .../e-mail-display-popup-prefer-plain.c            |  380 ++++++++++++++++++++
 .../e-mail-display-popup-prefer-plain.h            |   30 ++
 modules/prefer-plain/e-mail-parser-prefer-plain.c  |  270 ++++++--------
 .../prefer-plain/evolution-module-prefer-plain.c   |    2 +
 widgets/misc/e-web-view.c                          |    5 +-
 13 files changed, 732 insertions(+), 189 deletions(-)

commit 137eec97eb4f3d25f662e651c168d67e7e9e85e4
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Jun 26 12:02:36 2012 +0200

    Bug #617557 - Can close composer while message is sending

 composer/e-msg-composer.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit d85eac79693e7b7a6d35248e4aabd5aaa911cb9c