commit d131786a3f6c9337e738df9f70e64e2f373d1c44
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun May 8 12:26:10 2011 -0400

    NEWS update for 3.1.1 release.

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

commit 0a33b27e0cfdc7ab0157b7ba29fc8c1774b92eae
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun May 8 12:42:36 2011 -0400

    Remove groupwise-features files from  POTFILES.in.

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

commit 4cfb84c573f21ca7519e24cff1c5742b715355c4
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat May 7 12:22:36 2011 -0400

    Whitespace and coding style cleanups.

 .../gui/contact-editor/e-contact-editor-fullname.c |    4 +-
 .../gui/contact-editor/e-contact-quick-add.c       |    8 ++--
 addressbook/gui/widgets/e-addressbook-view.c       |    4 +-
 addressbook/gui/widgets/e-minicard-view.c          |    3 +-
 addressbook/importers/evolution-csv-importer.c     |   10 +++-
 addressbook/importers/evolution-ldif-importer.c    |   10 +++-
 .../evolution-addressbook-export-list-folders.c    |    4 +-
 calendar/gui/alarm-notify/alarm-queue.c            |    2 -
 calendar/gui/dialogs/comp-editor.c                 |   21 +++++---
 calendar/gui/dialogs/task-editor.c                 |    3 +-
 calendar/gui/e-meeting-store.c                     |    7 ++-
 calendar/gui/e-task-table.c                        |    6 ++-
 calendar/gui/e-week-view-event-item.c              |    3 +-
 calendar/gui/e-week-view-layout.c                  |    4 +-
 calendar/gui/e-week-view-titles-item.c             |    4 +-
 calendar/gui/gnome-cal.c                           |    9 ++-
 capplet/settings/mail-guess-servers.c              |    4 +-
 composer/e-msg-composer.c                          |   12 +++--
 em-format/em-format-quote.c                        |   14 ++++--
 em-format/em-format.c                              |   35 ++++++++++----
 em-format/em-stripsig-filter.c                     |    4 +-
 filter/e-filter-option.c                           |   22 +++++---
 filter/e-filter-rule.c                             |    3 +-
 filter/e-rule-context.c                            |   21 ++++++--
 libgnomecanvas/gnome-canvas-rich-text.c            |    4 +-
 libgnomecanvas/gnome-canvas-text.c                 |    3 +-
 libgnomecanvas/gnome-canvas.c                      |    7 ++-
 mail/e-mail-backend.c                              |    3 +-
 mail/e-mail-display.c                              |   14 ++++-
 mail/e-mail-paned-view.c                           |    4 +-
 mail/e-mail-reader.c                               |   16 ++++---
 mail/e-mail-session.c                              |   17 +++++--
 mail/e-mail-store.c                                |   18 +++++--
 mail/em-config.c                                   |    2 +-
 mail/em-folder-selection-button.c                  |    1 -
 mail/em-folder-tree.c                              |    3 +-
 mail/em-folder-utils.c                             |   51 ++++++++++++++-----
 mail/em-format-html.c                              |   14 +++---
 mail/em-format-html.h                              |   16 +++++--
 mail/em-utils.c                                    |   13 ++++--
 mail/em-vfolder-rule.c                             |    7 ++-
 mail/importers/mail-importer.c                     |   12 ++++-
 mail/mail-folder-cache.c                           |   18 +++++--
 mail/mail-send-recv.c                              |   21 ++++++--
 mail/mail-vfolder.c                                |   13 ++++--
 modules/calendar/e-cal-shell-view-private.c        |    6 ++-
 modules/mail/em-mailer-prefs.c                     |    2 +-
 modules/plugin-mono/e-plugin-mono.c                |    3 +-
 plugins/dbx-import/dbx-importer.c                  |    6 ++-
 plugins/save-calendar/csv-format.c                 |    3 +-
 plugins/templates/templates.c                      |   12 ++--
 shell/e-shell-migrate.c                            |   14 ++++--
 shell/es-event.c                                   |    8 ++-
 shell/main.c                                       |    8 ++--
 smime/lib/e-asn1-object.c                          |    3 +-
 widgets/e-timezone-dialog/e-timezone-dialog.c      |    3 +-
 widgets/misc/e-calendar-item.c                     |    3 +-
 widgets/misc/e-dateedit.c                          |    3 +-
 widgets/misc/e-map.c                               |    4 +-
 widgets/misc/ea-calendar-cell.c                    |    3 +-
 widgets/misc/ea-calendar-item.c                    |    3 +-
 widgets/table/e-cell-date.c                        |    4 +-
 widgets/table/e-table-config.c                     |    7 ++-
 widgets/table/e-table-field-chooser-item.c         |    3 +-
 widgets/table/e-table-header-item.c                |   10 +++-
 widgets/table/e-table-header-utils.c               |    4 +-
 widgets/table/e-table-header.c                     |    7 ++-
 widgets/table/e-table-search.c                     |    6 ++-
 widgets/table/e-table.c                            |    6 ++-
 widgets/table/e-tree.c                             |   10 +++-
 widgets/table/gal-a11y-e-table-item.c              |    6 ++-
 widgets/text/e-text-model.c                        |    3 +-
 widgets/text/e-text.c                              |   19 +++++--
 widgets/text/gal-a11y-e-text.c                     |    9 ++-
 74 files changed, 446 insertions(+), 206 deletions(-)

commit c7b455de89487e606fc620420c1778f5e55afcac
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat May 7 11:15:51 2011 -0400

    Adapt to CamelFolder:name -> display-name.

 mail/e-mail-reader.c                          |    4 ++--
 mail/em-folder-properties.c                   |    2 +-
 mail/em-folder-utils.c                        |    2 +-
 mail/em-utils.c                               |    2 +-
 mail/mail-ops.c                               |    4 +++-
 modules/mail/e-mail-attachment-handler.c      |    2 +-
 modules/mail/e-mail-shell-view-private.c      |    2 +-
 plugins/mail-notification/mail-notification.c |    2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

commit 4660d0fcad7ca0e6ad74241d3133a37b82e4e9de
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat May 7 10:29:37 2011 -0400

    Adapt to CamelFolderInfo.name -> display_name.

 mail/em-folder-tree-model.c   |   27 ++++++++++++++-------------
 mail/em-subscription-editor.c |    2 +-
 mail/mail-vfolder.c           |    4 +++-
 plugins/templates/templates.c |    8 ++++----
 4 files changed, 22 insertions(+), 19 deletions(-)

commit 2b1b637832f0fb86e1cb1026b82ded43088c35df
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:34:31 2011 -0400

    mail-send-recv.c:get_folders(): Adapt to CamelVeeStore change.
    
    See E-D-S commit 26c74be4066dff41dd1e9c9adc1c2c116142ba60.

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

commit bf5647aa4774c73491392d3e37da2e00691331f9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 12:40:02 2011 -0400

    MailFolderCache: Drop folder URI in "folder-changed" signal.
    
    We already include a CamelStore and folder name string in the signal
    arguments, so it's trivial to reconstruct the URI if it's needed.

 e-util/e-marshal.list    |    2 +-
 mail/e-mail-backend.c    |    7 +++++-
 mail/mail-folder-cache.c |   50 ++++++++++++++++-----------------------------
 3 files changed, 25 insertions(+), 34 deletions(-)

commit 48309e3765ba8fae248a1ec6f9f8a1ab395a92a8
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 12:36:28 2011 -0400

    Remove em_folder_tree_get_selected_folder_info().
    
    Function is no longer used, or wanted.

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

commit 6d44258b85c29fb7c08dcaf842975435bbf44805
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 12:34:33 2011 -0400

    em_folder_utils_create_folder(): Change function parameters.
    
    Take a folder URI string instead of a CamelFolderInfo, and swap places
    with the GtkWindow parameter.

 mail/em-folder-selector.c                |    4 +++-
 mail/em-folder-utils.c                   |   16 ++++++++++------
 mail/em-folder-utils.h                   |    4 ++--
 modules/mail/e-mail-shell-backend.c      |    2 +-
 modules/mail/e-mail-shell-view-actions.c |   12 ++++++------
 5 files changed, 22 insertions(+), 16 deletions(-)

commit 308f972f0809e6fb638308adb71ed9549311487b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 12:23:21 2011 -0400

    em_folder_utils_copy_folder(): Change function parameter.
    
    Take a folder URI string instead of a CamelFolderInfo.

 mail/em-folder-utils.c                   |   77 ++++++++++++++++++------------
 mail/em-folder-utils.h                   |    2 +-
 modules/mail/e-mail-shell-view-actions.c |   22 +++++----
 3 files changed, 60 insertions(+), 41 deletions(-)

commit 65f2472d6acb70c98cc2014b02b242f58f63d4fc
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 11:33:37 2011 -0400

    Remove e_get_account_by_source_url().
    
    Function is no longer used, or wanted.

 doc/reference/shell/eshell-sections.txt       |    1 -
 doc/reference/shell/tmpl/e-account-utils.sgml |    9 ---
 e-util/e-account-utils.c                      |   68 -------------------------
 e-util/e-account-utils.h                      |    1 -
 4 files changed, 0 insertions(+), 79 deletions(-)

commit 49c833b128823ffc7bf8c3ad68ec3fc656e76464
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 11:31:29 2011 -0400

    Adapt to X-Evolution-Source headers storing UIDs.

 mail/em-utils.c |    8 +++-----
 mail/mail-ops.c |   38 ++++++++++----------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

commit e3f577a5b9c6c9fd8ed45dc025cc3fe9f27da63d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 10:24:11 2011 -0400

    Remove uid_cachename_hack().
    
    It was building the old CamelStore path based on the URI.
    
    Gone before 0.11 my ass.

 mail/mail-ops.c |   31 +++++++------------------------
 1 files changed, 7 insertions(+), 24 deletions(-)

commit 4799633f714b2311a9c9f7f92ef88fcdc62537e6
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri May 6 10:18:30 2011 -0400

    fetch_mail_exec(): Remove hack for local Inbox.
    
    Don't call camel_filter_driver_filter_mbox() on the local Inbox since
    the local Inbox is no longer an mbox.  Just treat it like any other
    folder.

 mail/mail-ops.c |  158 +++++++++++++++++++++++--------------------------------
 1 files changed, 66 insertions(+), 92 deletions(-)

commit c6d62ffed1b0b14f6209fe4c9e9f13d84d7883f6
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 18:38:31 2011 -0400

    Remove em_uri_from_camel() and em_uri_to_camel().
    
    Functions are no longer used, or wanted.

 mail/em-utils.c |  142 -------------------------------------------------------
 mail/em-utils.h |    4 --
 2 files changed, 0 insertions(+), 146 deletions(-)

commit 68dbed3700f1c97f58a14e01b761ae0d95b7d95e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 18:28:41 2011 -0400

    mail-config.c: Don't try to rename obsolete config files.

 mail/mail-config.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

commit b8bb681c179c59e18a0fd361806cfbdaafd7c269
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 18:23:11 2011 -0400

    MailFolderCache: Emit folder names instead of URIs in signals.

 mail/e-mail-backend.c    |   11 +-
 mail/mail-autofilter.c   |   48 ++++++----
 mail/mail-autofilter.h   |   10 +-
 mail/mail-config.c       |   23 ++++-
 mail/mail-folder-cache.c |  100 ++++++++++---------
 mail/mail-vfolder.c      |  240 ++++++++++++++++++----------------------------
 6 files changed, 202 insertions(+), 230 deletions(-)

commit 19fd9e96f2bca8a8fb598367bfab930a43c0c175
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 17:44:46 2011 -0400

    mail-config.c: Code cleanups.

 mail/mail-config.c |  213 ++++++++++++++++++++++++++--------------------------
 1 files changed, 108 insertions(+), 105 deletions(-)

commit ee06c4a5e6bd4e7a683ae97f9b996360e362ba93
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 17:25:08 2011 -0400

    mail-vfolder.c: Coding style cleanups.

 mail/mail-vfolder.c |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)

commit b700aaf9aa14a2634f926f2385b1bc8d663bfd31
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:48:37 2011 -0400

    Simplify vfolder_adduri_desc().

 mail/mail-vfolder.c |   69 +++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 38 deletions(-)

commit 467bc6e244c574d872bc17faac7af00509626edf
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:43:51 2011 -0400

    Simplify em_vfolder_rule_from_address().

 mail/mail-autofilter.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

commit c84997a37e3a03b7cda17ebbb2b4c0e0ad0db432
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:42:45 2011 -0400

    Simplify em_vfolder_rule_from_message().

 mail/mail-autofilter.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

commit a84705e2990ebc65b16808fa3e4d67cc0811d91e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:38:30 2011 -0400

    Simplify e_mail_session_unsubscribe_folder_sync().

 mail/e-mail-session-utils.c |   49 +++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 31 deletions(-)

commit 3cd59099b02341d95f7ece384243e5bb974a6c2a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:34:10 2011 -0400

    e_mail_local_init(): Use the new folder URI format.

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

commit cb9a7d783e6d479789267bc4a4e75addf6b6173a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:29:23 2011 -0400

    EMVFolderRule: Use the new folder URI format.

 mail/em-vfolder-rule.c |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

commit ed94c3461ea6a4df6dc0bd8eba31952650690e4d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:20:37 2011 -0400

    EMFilterFolderElement: Use the new folder URI format.
    
    No longer need to distinguish between Camel URIs and Evolution URIs.

 mail/em-filter-folder-element.c |   36 ++++--------------------------------
 mail/em-filter-folder-element.h |    4 ----
 mail/em-vfolder-context.c       |   13 ++++---------
 3 files changed, 8 insertions(+), 45 deletions(-)

commit 575f27afecf4d16b7badd20856cddd2c56790b91
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:09:48 2011 -0400

    EMFolderTreeModel: Use the new folder URI format.
    
    Disregard CamelFolderInfo.uri strings.

 mail/em-folder-tree-model.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

commit 1ffacfeee95b69419b96423afef91b66be2a7d34
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 16:02:56 2011 -0400

    Introduce a new, simpler folder URI format.
    
    Folder URIs shall henceforth be exclusive to Evolution.
    
    The new format is:
    
        'folder://' CAMEL_STORE_UID '/' CAMEL_FOLDER_PATH
    
    Add e_mail_folder_uri_build() to construct such a URI from a CamelStore
    and folder path string, change e_mail_folder_uri_from_folder() to build
    the new URI, and teach e_mail_folder_uri_parse() to parse it.
    
    e_mail_folder_uri_parse() will continue to know how to parse the older
    URI formats still present in config files and GConf keys.  This captures
    the legacy knowledge neatly into one function.

 mail/e-mail-folder-utils.c |   71 +++++++++++++++++++++++++++++++++++++++-----
 mail/e-mail-folder-utils.h |    2 +
 2 files changed, 65 insertions(+), 8 deletions(-)

commit f967ad1dcbe459b9b4f9ae84cf26a1720b81f210
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 15:09:53 2011 -0400

    EMAccountEditor: Fix a runtime warning.
    
    Before selecting a URI in the EMFolderSelectionButton for Drafts and
    Sent folders, install an EMailSession in each button which is needed
    for parsing URIs.

 mail/em-account-editor.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit 405c6782b6c43d24397457be0b4c20780501a969
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:34:31 2011 -0400

    Random little coding style cleanups.

 mail/e-mail-local.c             |    3 +-
 mail/e-mail-reader-utils.c      |    3 +-
 mail/e-mail-session.c           |    1 -
 mail/em-filter-folder-element.c |   60 +++++++++++++++++++++-----------------
 4 files changed, 35 insertions(+), 32 deletions(-)

commit 3dfb04b686797f6b43f74ba4f42b326cb4347ce9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:29:14 2011 -0400

    EMailDisplay: Coding style cleanup.

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

commit 8f4e85e44c1f4cc52e7705c029ec326e785f96ac
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:22:36 2011 -0400

    EMFolderTreeModel: Avoid e_get_account_by_source_url().
    
    Use e_get_account_by_uid() instead.

 mail/em-folder-tree-model.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 8b23032f2fde03d2cde5cba32e8b4dbd53a05e49
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:18:38 2011 -0400

    EMFolderTreeModel: Always populate the CamelStore column.
    
    Even in 'Loading...' rows.  This way we know the CamelStore is present
    in all rows, and don't have to test for NULL.

 mail/em-folder-tree-model.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

commit 4978b0bf37a65a50598b2af1ac2c5fb6cc14db5a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:15:56 2011 -0400

    Simplify em_folder_tree_model_set_folder_info().
    
    e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both
    URIs, so we can just hand it an 'email://' URI directly.

 mail/em-folder-tree-model.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

commit 3433cca045b1f59ec026d16790ff6c604edf3463
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:07:33 2011 -0400

    Simplify em_utils_folder_is_sent().
    
    e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both
    URIs, so we can just hand it an 'email://' URI directly.

 mail/em-utils.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

commit 03315463529dd850639984f79b014c9486f2230a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:06:14 2011 -0400

    Simplify em_utils_folder_is_drafts().
    
    e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both
    URIs, so we can just hand it an 'email://' URI directly.

 mail/em-utils.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

commit 6077ee74b623ee5fa1c5b79c4e74f79b48a91b9e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 14:02:48 2011 -0400

    Simplify em_utils_folder_is_templates().
    
    e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both
    URIs, so we can just hand it an 'email://' URI directly.

 mail/em-utils.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

commit 762fcc69529a4ce1822f4d978e2d4f85eef4cacc
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 13:57:49 2011 -0400

    Simplify emae_account_folder().
    
    EMFolderSelectionButton uses e_mail_folder_uri_parse(), so we can just
    hand it an 'email://' URI directly.

 mail/em-account-editor.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

commit 974924a8b8ceb3cabd6a4e517b1a1a1285fa137f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 13:52:52 2011 -0400

    Drop support for command-line 'email://' URIs.
    
    I have no idea what this was used for, but it looks way too convoluted
    to be useful anymore.

 modules/mail/e-mail-shell-backend.c |  109 +----------------------------------
 1 files changed, 3 insertions(+), 106 deletions(-)

commit ecdcc26c4ad72000c971cfc63e80c67f450b7771
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 13:47:09 2011 -0400

    Simplify e_mail_session_uri_to_folder_sync().
    
    This relies on e_mail_folder_uri_parse() to handle 'email://' URIs.
    
    See the previous commit.

 mail/e-mail-session.c |   80 ++++++++-----------------------------------------
 1 files changed, 13 insertions(+), 67 deletions(-)

commit 4d08cc60e5401caba786e74bf6c1fb5bf9424e3f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 13:25:47 2011 -0400

    Teach e_mail_folder_uri_parse() to parse 'email://' URIs.

 mail/e-mail-folder-utils.c |   69 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 9 deletions(-)

commit d9ba7c175b630f826a6d928561e2f43189527e22
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu May 5 12:28:44 2011 -0400

    Simplify em_folder_tree_set_selected_list().

 mail/em-folder-tree.c |   97 +++++++++++++++++++------------------------------
 1 files changed, 38 insertions(+), 59 deletions(-)

commit 95df7fb5e24c6979f53c25bd177565d548c7b28b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu May 5 19:24:37 2011 +0200

    Updated galician translations

 po/gl.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit aae601b3bae2a66da4e50cd772c519847cf9ebfb
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Thu May 5 10:40:41 2011 -0400

    Bug 649381 - Memory leaks in contact editor

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

commit 8195647e9b92dc3928a66893e8ac1fba88019b66
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Thu May 5 09:57:48 2011 -0400

    Bug 332497 - Add Edit -> Available Categories
    
    Opens a window to manage categories without having to edit a contact or
    appointment.  Not available in the Mail shell view since it doesn't use
    categories.

 shell/e-shell-window-actions.c |   44 ++++++++++++++++++++++++++++++++++++++++
 ui/evolution-calendars.ui      |    3 ++
 ui/evolution-contacts.ui       |    3 ++
 ui/evolution-memos.ui          |    3 ++
 ui/evolution-tasks.ui          |    3 ++
 5 files changed, 56 insertions(+), 0 deletions(-)

commit 19a9f3474019e83d51f2baee6537f5c71a208a2a
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu May 5 13:22:46 2011 +0200

    Bug #627952 - 'Local delivery' mbox's aren't read properly

 mail/e-mail-store.c |   20 ++++++++++++++------
 mail/em-utils.c     |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

commit 3382355fb8c1ba535d8cc67701fdf17e1ea3ff3b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed May 4 19:49:21 2011 +0200

    Updated Spanish translation

 po/es.po | 1010 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 509 insertions(+), 501 deletions(-)

commit 218bd67a1e0ab29971d3bf7f1c111210b0d74e2d
Author: Vibha Yadav <yvibha@novell.com>
Date:   Wed May 4 17:34:48 2011 +0530

    Bug 649365 - Creation of new repository evolution-groupwise
    
    Removing groupwise plugin code from evolution.

 configure.ac                                       |    6 +-
 plugins/groupwise-features/Makefile.am             |   97 --
 plugins/groupwise-features/addressbook-groupwise.c |   69 --
 plugins/groupwise-features/camel-gw-listener.c     | 1043 --------------------
 plugins/groupwise-features/camel-gw-listener.h     |   58 --
 .../groupwise-features/groupwise-account-setup.c   |  138 ---
 plugins/groupwise-features/gw-ui.c                 |  459 ---------
 plugins/groupwise-features/gw-ui.h                 |   38 -
 plugins/groupwise-features/install-shared.c        |  274 -----
 plugins/groupwise-features/junk-mail-settings.c    |  119 ---
 plugins/groupwise-features/junk-settings.c         |  428 --------
 plugins/groupwise-features/junk-settings.h         |   82 --
 plugins/groupwise-features/junk-settings.ui        |  458 ---------
 plugins/groupwise-features/mail-retract.c          |  119 ---
 plugins/groupwise-features/mail-send-options.c     |  246 -----
 plugins/groupwise-features/mail-send-options.h     |   43 -
 plugins/groupwise-features/notification.ui         |  216 ----
 .../org-gnome-compose-send-options.xml             |   17 -
 .../org-gnome-groupwise-features.eplug.xml         |  108 --
 .../org-gnome-mail-retract.error.xml               |    8 -
 .../org-gnome-process-meeting.error.xml            |   44 -
 .../org-gnome-proxy-login.error.xml                |   16 -
 .../groupwise-features/org-gnome-proxy.error.xml   |   27 -
 .../org-gnome-shared-folder.error.xml              |   19 -
 plugins/groupwise-features/process-meeting.c       |  442 ---------
 plugins/groupwise-features/properties.ui           |  756 --------------
 plugins/groupwise-features/proxy-add-dialog.ui     |  730 --------------
 plugins/groupwise-features/proxy-listing.ui        |  153 ---
 plugins/groupwise-features/proxy-login-dialog.ui   |  191 ----
 plugins/groupwise-features/proxy-login.c           |  563 -----------
 plugins/groupwise-features/proxy-login.h           |   62 --
 plugins/groupwise-features/proxy.c                 | 1034 -------------------
 plugins/groupwise-features/proxy.h                 |   65 --
 plugins/groupwise-features/send-options.c          |  567 -----------
 plugins/groupwise-features/share-folder-common.c   |  519 ----------
 plugins/groupwise-features/share-folder.c          |  767 --------------
 plugins/groupwise-features/share-folder.h          |  100 --
 plugins/groupwise-features/status-track.c          |  271 -----
 38 files changed, 2 insertions(+), 10350 deletions(-)

commit ac393ed4017fec025c3dd66d4edbee2bea11cb06
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed May 4 11:39:11 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 3481 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1753 insertions(+), 1728 deletions(-)

commit 324a7da5d7c9af29f18431b197f2caa3a0d40ec6
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 19:24:58 2011 -0400

    Use e_mail_folder_uri_from_folder() instead of camel_folder_get_uri().

 mail/e-mail-notebook-view.c |   10 +++++--
 mail/e-mail-paned-view.c    |    5 ++-
 mail/e-mail-reader.c        |    6 +----
 mail/em-composer-utils.c    |   18 ++++++++++-----
 mail/mail-config.c          |    3 +-
 mail/mail-folder-cache.c    |   52 +++++++++++++++++++------------------------
 6 files changed, 48 insertions(+), 46 deletions(-)

commit 99680d557b5763ae01e1a674ce8f3810936cd2c7
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 16:30:09 2011 -0400

    Remove EMFolderTreeModel::folder-added signal.
    
    No one was listening.

 mail/em-folder-tree-model.c |   14 --------------
 mail/em-folder-tree-model.h |    4 ----
 2 files changed, 0 insertions(+), 18 deletions(-)

commit d3fab3c3207a324d6a72e494959debbb7f7ce240
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 15:34:02 2011 -0400

    EMFolderSelectionButton: Avoid e_get_account_by_source_url().
    
    Use e_get_account_by_uid() instead.

 mail/em-folder-selection-button.c |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

commit 1ce5e2fee4ddc4dc5238870a9907340fce53055d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 15:24:36 2011 -0400

    MessageList: Simplify the "Location" column.

 mail/message-list.c |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)

commit b4d14fdbe518e1009fd67e590c8d90ff5dc58382
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 15:18:15 2011 -0400

    groupwise-features: Avoid e_get_account_by_source_url().
    
    Use e_get_account_by_uid() instead.

 plugins/groupwise-features/install-shared.c      |    7 +++----
 plugins/groupwise-features/proxy-login.c         |   22 +++++++++++++---------
 plugins/groupwise-features/share-folder-common.c |   13 +++++--------
 3 files changed, 21 insertions(+), 21 deletions(-)

commit d05029936cd3245bf611fe7bec3c60ecb2c842cc
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 14:59:38 2011 -0400

    Drop 'folder_uri' member from MessageList.

 mail/e-mail-paned-view.c |   24 ++++++++++++++++--------
 mail/em-utils.c          |   14 +++++++++-----
 mail/em-utils.h          |    3 +--
 mail/message-list.c      |   25 +++----------------------
 mail/message-list.h      |    5 ++---
 5 files changed, 31 insertions(+), 40 deletions(-)

commit a9c9f0be5fd5aa5667412a7f1fb516d9133874df
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 14:42:29 2011 -0400

    Remove e_mail_reader_get_folder_uri().
    
    Instead call e_mail_reader_get_folder() and, if you really need to,
    generate the folder URI with e_mail_folder_uri_from_folder().

 mail/e-mail-notebook-view.c              |   35 +++++++++++++++++++++++------
 mail/e-mail-paned-view.c                 |   17 ++++++-------
 mail/e-mail-reader.c                     |   24 --------------------
 mail/e-mail-reader.h                     |    2 -
 modules/mail/e-mail-shell-view-actions.c |    9 ++++++-
 modules/mail/e-mail-shell-view-private.c |   30 ++++++++++++-------------
 modules/mail/e-mail-shell-view-private.h |    1 +
 modules/mail/e-mail-shell-view.c         |   20 ++++++++++------
 8 files changed, 69 insertions(+), 69 deletions(-)

commit 76280e456d8d9789e9a9d2186926fc5607bd8967
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 14:07:50 2011 -0400

    Build vfolder rules with CamelFolders instead of folder URIs.

 mail/e-mail-reader-utils.c |    8 +-------
 mail/e-mail-reader.c       |   12 ++++++------
 mail/mail-autofilter.c     |   19 +++++++++++++++----
 mail/mail-autofilter.h     |    4 ++--
 mail/mail-vfolder.c        |   14 ++++++++------
 mail/mail-vfolder.h        |    6 +++---
 6 files changed, 35 insertions(+), 28 deletions(-)

commit 06411bdbbb3e6877c679007c269c84b05713f895
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 13:42:15 2011 -0400

    Remove 'from_uri' params from e-msg-composer-utils.c.
    
    Pass CamelFolder objects instead, which are already available at almost
    every call site.

 mail/e-mail-display.c                              |    6 +-
 mail/e-mail-reader.c                               |   22 ++---
 mail/em-composer-utils.c                           |   95 +++++++++++---------
 mail/em-composer-utils.h                           |    9 +-
 modules/mail/e-mail-shell-backend.c                |   39 +++++++--
 .../mailing-list-actions/mailing-list-actions.c    |   17 ++--
 6 files changed, 107 insertions(+), 81 deletions(-)

commit 1957378edf2264426c77571bde90c6bfeb7e50ce
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 11:30:11 2011 -0400

    Change em_folder_tree_model_user_marked_unread() params.
    
    Take a CamelFolder instead of a folder URI string.

 mail/e-mail-reader.c        |    6 +++---
 mail/em-folder-tree-model.c |    8 ++++++--
 mail/em-folder-tree-model.h |    2 +-
 mail/message-list.c         |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

commit 3bdba393f75bf3073d4b3e325fc4092dc1268ea9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 10:54:56 2011 -0400

    Fix a runtime warning in e_mail_reader_check_state().
    
    Don't call em_utils_folder_is_drafts() or em_utils_folder_is_outbox() if
    the CamelFolder is NULL.

 mail/e-mail-reader.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

commit b8a932ae1e8b10344525ae2a5a78894e98ac2540
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 10:45:46 2011 -0400

    Fix compiler warnings.
    
    Mostly dead assignments.

 e-util/e-account-utils.c                   |    3 ---
 mail/e-mail-folder-pane.c                  |    4 ----
 mail/e-mail-notebook-view.c                |    2 --
 mail/e-mail-reader-utils.c                 |    9 +--------
 mail/e-mail-reader.c                       |    4 ----
 mail/em-account-editor.c                   |    3 ---
 modules/addressbook/e-book-shell-content.c |    2 --
 modules/calendar/e-memo-shell-content.c    |    4 ----
 modules/calendar/e-task-shell-content.c    |    2 --
 modules/mail/e-mail-shell-view-private.c   |    4 ----
 modules/mail/e-mail-shell-view.c           |    3 ---
 plugins/itip-formatter/itip-formatter.c    |    3 ---
 12 files changed, 1 insertions(+), 42 deletions(-)

commit c3b983d6e12e218b6f908cf263e7e08570332d6a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 09:40:49 2011 -0400

    Drop 'folder_uri' param from em_utils_folder_is_outbox().

 mail/e-mail-folder-pane.c                |    4 ++--
 mail/e-mail-paned-view.c                 |    2 +-
 mail/e-mail-reader-utils.c               |    6 +++---
 mail/e-mail-reader.c                     |    4 ++--
 mail/e-mail-sidebar.c                    |    6 ++++--
 mail/em-folder-tree-model.c              |    2 +-
 mail/em-utils.c                          |   26 ++++++--------------------
 mail/em-utils.h                          |    2 +-
 mail/mail-folder-cache.c                 |    3 +--
 modules/mail/e-mail-shell-view-private.c |    4 ++--
 plugins/itip-formatter/itip-formatter.c  |    4 ++--
 11 files changed, 25 insertions(+), 38 deletions(-)

commit b9f932b1b84349e80e8383d925a00a75a3b7fe29
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 09:16:49 2011 -0400

    Drop 'folder_uri' param from em_utils_folder_is_sent().

 mail/e-mail-paned-view.c                 |    2 +-
 mail/e-mail-reader-utils.c               |    2 +-
 mail/e-mail-reader.c                     |    2 +-
 mail/em-utils.c                          |   18 ++++++++++--------
 mail/em-utils.h                          |    2 +-
 mail/mail-folder-cache.c                 |    3 +--
 modules/mail/e-mail-shell-view-private.c |    4 ++--
 modules/mail/e-mail-shell-view.c         |    4 ++--
 plugins/itip-formatter/itip-formatter.c  |    4 ++--
 9 files changed, 21 insertions(+), 20 deletions(-)

commit c694ca567b0339afea05d1e36a74290a7cd06944
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 09:07:26 2011 -0400

    Drop 'folder_uri' param from em_utils_folder_is_templates().

 mail/e-mail-folder-pane.c  |    2 +-
 mail/e-mail-reader-utils.c |    2 +-
 mail/em-composer-utils.c   |    2 +-
 mail/em-utils.c            |   18 ++++++++++--------
 mail/em-utils.h            |    2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

commit 9e0f0f529f363717fa0a2884fe576d8a26ed3df2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 08:59:35 2011 -0400

    Drop 'folder_uri' param from em_utils_folder_is_drafts().

 mail/e-mail-folder-pane.c                |    4 ++--
 mail/e-mail-paned-view.c                 |    2 +-
 mail/e-mail-reader-utils.c               |    4 ++--
 mail/e-mail-reader.c                     |    6 +++---
 mail/em-composer-utils.c                 |    7 +++----
 mail/em-folder-tree-model.c              |    2 +-
 mail/em-utils.c                          |   16 +++++++++-------
 mail/em-utils.h                          |    2 +-
 mail/mail-folder-cache.c                 |    7 ++-----
 modules/mail/e-mail-shell-view-private.c |    2 +-
 plugins/itip-formatter/itip-formatter.c  |    4 ++--
 11 files changed, 27 insertions(+), 29 deletions(-)

commit 7b32d2fb5a9576573ce47fb7d77624ede06bb6a8
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 07:51:45 2011 -0400

    em-utils.c: Simplify guess_account_from_folder().

 mail/em-utils.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

commit 554f2eacf773dac9e000dc4415209c70e06efbc3
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 07:50:40 2011 -0400

    em-utils.c: More coding style cleanups.

 mail/em-utils.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

commit e7136c728938dc75211111148cd184731f720911
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 07:06:10 2011 -0400

    Replace camel_store_folder_uri_equal() with e_mail_folder_uri_equal().

 mail/em-folder-tree-model.c |    7 +++-
 mail/em-utils.c             |   82 +++++++++++++++++++++++--------------------
 mail/mail-vfolder.c         |   65 ++++++++++++++++++++--------------
 3 files changed, 87 insertions(+), 67 deletions(-)

commit 91926cfad40b5a94cc34243db9fc17b6ad55b15c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 06:46:38 2011 -0400

    em-utils.c: Coding style cleanups.

 mail/em-utils.c |  137 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 71 insertions(+), 66 deletions(-)

commit b21a89d79c6bb6a380b58988d30cff6de03ab91d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue May 3 06:06:20 2011 -0400

    Add some handy folder URI utility functions.
    
    e_mail_folder_uri_parse()
    
        Parses a folder URI and returns a corresponding CamelStore instance
        and folder name string, or else sets a GError.
    
    e_mail_folder_uri_equal()
    
        Compares two folder URIs for equality.
        Replaces camel_store_folder_uri_equal().
    
    e_mail_folder_uri_from_folder()
    
        This will eventually replace camel_folder_get_uri(), but for now it
        just calls camel_folder_get_uri() and duplicates the URI string.

 mail/e-mail-folder-utils.c |  155 ++++++++++++++++++++++++++++++++++++++++++++
 mail/e-mail-folder-utils.h |   10 +++
 2 files changed, 165 insertions(+), 0 deletions(-)

commit 0434afb9a5831d93a5c0dd7c842aa3f92efa3dae
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 21:54:12 2011 -0400

    Drop 'folder_uri' param from message_list_set_folder().

 mail/e-mail-reader.c |    2 +-
 mail/message-list.c  |   17 ++++++++++++-----
 mail/message-list.h  |    3 +--
 3 files changed, 14 insertions(+), 8 deletions(-)

commit 1e95563462edb8e4db64889811cfa2abb7107c58
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 21:41:23 2011 -0400

    MessageList coding style cleanups.

 mail/message-list.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

commit 96f2945894ede215b920f7ea69f6e6074e4beaf0
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 21:06:25 2011 -0400

    Remove e_mail_reader_set_folder_uri().
    
    Function is no longer used, or wanted.

 mail/e-mail-reader.c |   30 ------------------------------
 mail/e-mail-reader.h |    2 --
 2 files changed, 0 insertions(+), 32 deletions(-)

commit ae28ea4621c9ced08524548ca67a5297c284ce01
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 21:01:48 2011 -0400

    EMailShellView: Open the selected folder ourselves.
    
    This one's a little involved:
    
     - EMailShellView now obtains a CamelFolder itself in response to
       EMFolderTree::folder-selected signals.  Uses EActivity to do so.
    
     - Revise EMFolderTree::folder-selected signal arguments to be more
       useful: emit a CamelStore object instead of a folder URI.
    
     - Also revise EMFolderTree::folder-activiated signal arguments the
       same way while we're at it.
    
     - Remove the "folder_uri" argument from e_mail_reader_set_folder().
       If you have a CamelFolder object you can obtain the URI string by
       calling camel_folder_get_uri().

 e-util/e-marshal.list                    |    2 +-
 mail/e-mail-notebook-view.c              |   14 ++--
 mail/e-mail-paned-view.c                 |    7 +-
 mail/e-mail-reader-utils.c               |    2 +-
 mail/e-mail-reader.c                     |   22 +++---
 mail/e-mail-reader.h                     |    6 +-
 mail/em-folder-selector.c                |   14 +++-
 mail/em-folder-tree.c                    |   49 +++++++------
 mail/em-folder-tree.h                    |   10 +-
 mail/mail.error.xml                      |    6 ++
 modules/mail/e-mail-shell-backend.c      |    2 +-
 modules/mail/e-mail-shell-content.c      |    5 +-
 modules/mail/e-mail-shell-view-private.c |  119 +++++++++++++++++++++++++++---
 modules/mail/e-mail-shell-view-private.h |    3 +
 modules/mail/e-mail-shell-view.c         |   22 ++----
 15 files changed, 194 insertions(+), 89 deletions(-)

commit 52844f40f158be11749f5d8dcdf52454e776c9bd
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 19:07:06 2011 -0400

    Add em_folder_tree_get_selected_account().
    
    Comes in handy for a few EMailShellView actions.

 mail/em-folder-tree.c                    |   26 ++++++++++++++++++++++++++
 mail/em-folder-tree.h                    |    2 ++
 modules/mail/e-mail-shell-view-actions.c |   19 ++++---------------
 modules/mail/e-mail-shell-view.c         |    6 +++---
 4 files changed, 35 insertions(+), 18 deletions(-)

commit 305c62f1e07d1987b93fa7f4fe22b1eb891ebbd4
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 18:58:22 2011 -0400

    EMFolderTree: Coding style cleanups.

 mail/em-folder-tree.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

commit 668b95dfb0680701a7821ec8f39fcd319bcc0a64
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 18:37:28 2011 -0400

    EMailSession: Fix popb4smtp authentication.
    
    Forgot I had already made CamelSaslPOPB4SMTP expect a CamelSource UID
    from camel_session_get_password().

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

commit 18d8b5f73dcef5d6f3c1fdd02d168cf90762bb75
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 16:09:12 2011 -0400

    Remove e_get_account_by_transport_url().
    
    Function is no longer used, or wanted.

 doc/reference/shell/eshell-sections.txt       |    1 -
 doc/reference/shell/tmpl/e-account-utils.sgml |    9 ----
 e-util/e-account-utils.c                      |   58 -------------------------
 e-util/e-account-utils.h                      |    1 -
 4 files changed, 0 insertions(+), 69 deletions(-)

commit 7c8489e9d644c5e101a5c74bbc393868d957532a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 15:54:54 2011 -0400

    Simplify mail_session_get_password().
    
    Utilizes the new capability in e_get_account_by_uid() to handle both
    CamelStore and CamelTransport UIDs.

 mail/e-mail-session.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

commit 7b4a69edc4a67445ae11c77135772934e4d380a2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 15:34:56 2011 -0400

    EMConfigTargetAccount: Add original_account member.
    
    Rename the existing 'account' member to 'modified_account' and add an
    'original_account' member so plugins have direct access to both.
    
    Mostly of benefit to the imap-features plugin.

 mail/em-account-editor.c                  |   13 +++++++++----
 mail/em-config.c                          |   29 ++++++++++++++++++++++-------
 mail/em-config.h                          |    8 ++++----
 plugins/groupwise-features/proxy.c        |    6 +++---
 plugins/groupwise-features/send-options.c |    2 +-
 plugins/imap-features/imap-headers.c      |   26 +++++++++++++++-----------
 6 files changed, 54 insertions(+), 30 deletions(-)

commit 74f86383fce61cd6712804f39a1baf011d59729a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 15:12:33 2011 -0400

    EMConfig coding style cleanups.

 mail/em-config.c |  150 +++++++++++++++++++++++++++--------------------------
 mail/em-config.h |   28 ++++++----
 2 files changed, 92 insertions(+), 86 deletions(-)

commit 5fcf41925becbac39447b315097b062de2bfd0a1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 14:21:21 2011 -0400

    EMEventTargetFolder: Add an EAccount member.
    
    The mail-notification plugin can use the EAccount member directly
    instead of searching for it by URI.

 mail/e-mail-backend.c                         |    7 ++++++-
 mail/em-event.c                               |    7 +++++++
 mail/em-event.h                               |    2 ++
 plugins/mail-notification/mail-notification.c |   20 ++++++++------------
 4 files changed, 23 insertions(+), 13 deletions(-)

commit ba47251738be2efbe56852e843f9b4c3e4be5b9a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 13:03:28 2011 -0400

    EMEvent coding style cleanups.

 mail/em-event.c |  108 +++++++++++++++++++++++++++++++------------------------
 mail/em-event.h |   70 +++++++++++++++++++++++-------------
 2 files changed, 106 insertions(+), 72 deletions(-)

commit f52c1d20c671f438c05727cfcbf16f19c522d2f3
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 12:24:12 2011 -0400

    e_get_account_by_uid(): Also handle CamelTransport UIDs.
    
    Enhance e_get_account_by_uid() to also accept CamelTransport UIDs.
    
    The convention we use to distinguish them is simple:
    
       Given an EAccount UID:
    
       - The CamelStore UID is the EAccount UID verbatim.
    
       - The CamelTransport UID is the EAccount UID + "-transport".
    
    So just check for a "-transport" suffix and truncate it.

 e-util/e-account-utils.c |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

commit fc0186d884b46c9fc1e4ce2df74155f974a61695
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon May 2 11:46:34 2011 -0400

    MailFolderCache: Remove 'folders_uri' hash table
    
    We've been adding and removing folder URIs to this hash table but never
    actually using it for anything.  Not a single lookup.  So just remove it.

 mail/mail-folder-cache.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

commit 2a1e788a82e3218982441b69bbcca4f1bd2cd970
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:   Sun May 1 23:03:51 2011 +0200

    [l10n] Updated German help translation

 help/de/de.po | 9436 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 4694 insertions(+), 4742 deletions(-)

commit 789118fda7113be0b1a7127c805298c58753fda4
Author: Lucian Langa <lucilanga@gnome.org>
Date:   Sun May 1 22:57:51 2011 +0300

    Bug 649046 - crash on startup with latest CamelURL modifications

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

commit 2f3abc7a8468e530532b3855349d0491dd6d2a46
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:   Sun May 1 13:20:05 2011 +0200

    [l10n] Updated German translation (Bug #647782)

 po/de.po |  758 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 414 insertions(+), 344 deletions(-)

commit 59080987bb01c7fbce582787cc8bbea699bafc3b
Author: Daniel Nylander <po@danielnylander.se>
Date:   Sun May 1 09:56:46 2011 +0200

    Updated Swedish translation

 po/sv.po | 3519 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1951 insertions(+), 1568 deletions(-)

commit 203709e14179e36ff277894e2a6165223db232ac
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sat Apr 30 23:42:04 2011 +0200

    Updated galician translations

 po/gl.po | 2586 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1317 insertions(+), 1269 deletions(-)

commit 384f70e95857297ccbab047b995c21943d9c812a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Apr 30 10:19:40 2011 -0400

    groupwise-features: Fix a compiler warning.

 plugins/groupwise-features/share-folder-common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 84585dd1f086d7b0fa4052ddb14bd6966c83e34f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Apr 30 10:19:00 2011 -0400

    EMFolderSelectionButton: Remove unused multiselect functions.

 mail/em-folder-selection-button.c |  168 ++++++-------------------------------
 mail/em-folder-selection-button.h |   10 --
 maint/evolution.xml               |    1 -
 3 files changed, 25 insertions(+), 154 deletions(-)

commit e03e3669931660317333efe66708df25cc5e1a8c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Apr 29 19:53:09 2011 +0200

    Updated Spanish translation

 po/es.po | 1150 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 592 insertions(+), 558 deletions(-)

commit 77397e699d0840a58aa507144631680a74bd8bed
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Apr 29 09:49:02 2011 -0400

    Adapt to extra arg in camel_session_get_service_by_url().

 mail/e-mail-session-utils.c                      |    2 +-
 mail/e-mail-session.c                            |    2 +-
 mail/em-folder-tree.c                            |    3 ++-
 mail/em-folder-utils.c                           |    6 +++---
 plugins/groupwise-features/install-shared.c      |    2 +-
 plugins/groupwise-features/share-folder-common.c |    5 +++--
 6 files changed, 11 insertions(+), 9 deletions(-)

commit d21199c9199bceb3bba10ca41a0e4c7fa8b1ad36
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Fri Apr 29 09:21:58 2011 +0200

    Bug #588891 - Spam settings dialog terribly un-higgy

 mail/mail-config.ui            |  120 ++++++++++++++++++++++++++++++++++++++++
 modules/mail/em-mailer-prefs.c |   83 +++++++++++++++-------------
 2 files changed, 164 insertions(+), 39 deletions(-)

commit 0ea909d4e23719823ae30f4d09d7cfc44e29b5ce
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Thu Apr 28 17:01:56 2011 -0400

    Bug 648756 - Custom imap port forgotten

 mail/em-account-editor.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

commit f2a4427777d4f59e1216bbce44770f0aa3174025
Author: Dan Vrátil <dvartil@redhat.com>
Date:   Thu Apr 28 15:44:51 2011 -0400

    Bug 645825 - Search bar not changing color when showing results

 shell/e-shell-searchbar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 708e9df1629dfcb42f9888f04e3c8bfc65ce5a0e
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu Apr 28 20:51:36 2011 +0200

    Updated Spanish translation

 po/es.po |  928 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 467 insertions(+), 461 deletions(-)

commit d3a5c49fdf90efd914ce7e340f0fd3514bb5eb13
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Apr 28 09:12:33 2011 +0200

    Make EAlertBar messages selectable

 widgets/misc/e-alert-bar.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 1f192fbb46ce36012ce3131eda9a818521985493
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Apr 27 21:43:40 2011 -0400

    Bug 597082 - Crash while migrating folder info
    
    In migrate_folders(), free the idle callback closure using a
    GDestroyNotify callback so we don't try to free the same memory
    repeatedly if the idle callback recurses while cycling the main loop.
    
    Why *are* we cycling the main loop anyway?  I don't get that part.

 mail/e-mail-migrate.c |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

commit 521caf8b6cbe648e8f5c5d6104cc58bb8446e0e3
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Apr 27 08:14:15 2011 -0400

    Add itip_get_fallback_identity().
    
    Convenience function returns a name + address string from the default
    mail identity, to be used as a fallback for organizers.

 calendar/gui/dialogs/event-page.c |   20 +++++++-------------
 calendar/gui/dialogs/memo-page.c  |   20 +++++++-------------
 calendar/gui/dialogs/task-page.c  |   18 ++++++------------
 calendar/gui/itip-utils.c         |   27 +++++++++++++++++++++++++++
 calendar/gui/itip-utils.h         |    1 +
 5 files changed, 48 insertions(+), 38 deletions(-)

commit c814aa614c78a6e6350f2380eb2e23dab6e0989e
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Apr 27 18:37:53 2011 +0200

    Fix a memory leak

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

commit 798daae58d040233e6c01dbe9ba8cd5251e096ed
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Apr 27 18:21:24 2011 +0200

    Bug #303862 - Cannot scroll message after clicking image attachment button

 mail/em-format-html-display.c |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

commit 7a6143871342888bfb3f3844fc8c94f0fe7ed18e
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Apr 27 17:42:49 2011 +0200

    Bug #303653 - Make headers collapsable in preview pane

 mail/e-mail-browser.c                |    1 +
 mail/e-mail-display.c                |    5 +
 mail/e-mail-paned-view.c             |   11 +++
 mail/em-format-html.c                |  152 ++++++++++++++++++++++++++++++++-
 mail/em-format-html.h                |   12 +++
 mail/evolution-mail.schemas.in       |   18 ++++-
 modules/mail/e-mail-shell-settings.c |    4 +
 7 files changed, 197 insertions(+), 6 deletions(-)

commit 5fcaadbc9a16f711c0fe81933ec9615f289c8fa8
Author: Dan Vrátil <dvratil@redhat.com>
Date:   Wed Apr 27 17:10:14 2011 +0200

    Bug #641845 - Add default expansion variables to templates plugin
    
    Users can read values from original message in the template
    by $ORIG[header] and with a special value $ORIG[body].

 plugins/templates/org-gnome-templates.eplug.xml |    5 +-
 plugins/templates/templates.c                   |  545 +++++++++++++++++++----
 2 files changed, 452 insertions(+), 98 deletions(-)

commit 81270ea009bdca0a9527737efa7ecb27a6260bff
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 18:22:29 2011 -0400

    Add itip_get_user_identities().
    
    Convenience function returns a NULL-terminated array of name + address
    strings based on registered mail identities.

 calendar/gui/dialogs/event-page.c |   61 ++++++++++++------------------------
 calendar/gui/dialogs/memo-page.c  |   62 ++++++++++++-------------------------
 calendar/gui/dialogs/task-page.c  |   61 ++++++++++++------------------------
 calendar/gui/itip-utils.c         |   45 ++++++++++++++++++++++++++-
 calendar/gui/itip-utils.h         |    1 +
 5 files changed, 105 insertions(+), 125 deletions(-)

commit 1af7571c5c475ecf3f95d56a0fe7af78c7be3180
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 16:23:40 2011 -0400

    Refactor CompEditor pages to isolate EAccount usage.
    
    Hide EAccount usage behind more generic APIs so EAccount can be replaced
    more easily in the account-mgmt branch.

 calendar/gui/dialogs/event-page.c |  216 ++++++++++++++++++++++---------------
 calendar/gui/dialogs/memo-page.c  |  161 ++++++++++++++++------------
 calendar/gui/dialogs/task-page.c  |  213 ++++++++++++++++++++++--------------
 3 files changed, 354 insertions(+), 236 deletions(-)

commit 2594b0d00cff45936250e9294ce6eb7cacd87c25
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 11:21:38 2011 -0400

    Add itip_address_is_user().
    
    Convenience function that checks whether the given email address matches
    a registered mail identity.

 calendar/gui/e-cal-model.c               |    2 +-
 calendar/gui/itip-utils.c                |   52 ++++++++++++++++++++----------
 calendar/gui/itip-utils.h                |    1 +
 plugins/groupwise-features/gw-ui.c       |    2 +-
 plugins/groupwise-features/proxy-login.c |    3 +-
 5 files changed, 40 insertions(+), 20 deletions(-)

commit c67695c6f2d5ea5450d90dbf0ecb5590744ec15a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 11:05:33 2011 -0400

    itip-utils cleanups.

 calendar/gui/itip-utils.c |   88 ++++++++++++++++++++++++++++----------------
 calendar/gui/itip-utils.h |   64 ++++++++++++++++++++------------
 2 files changed, 96 insertions(+), 56 deletions(-)

commit 67c0ce8617f12ee0a937ffe14fb40f390e4df86d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 10:26:55 2011 -0400

    Add e_meeting_store_find_self().
    
    Convenience function that uses registered mail identities to find the
    user among meeting attendees.

 calendar/gui/dialogs/event-editor.c |   23 +++-------------
 calendar/gui/dialogs/task-editor.c  |   24 ++++-------------
 calendar/gui/e-meeting-store.c      |   47 +++++++++++++++++++++++++++++++++++
 calendar/gui/e-meeting-store.h      |    3 ++
 4 files changed, 61 insertions(+), 36 deletions(-)

commit 8cd20682159f0e683cdd81af54611b9511f873a1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Apr 26 09:20:50 2011 -0400

    Remove redundant EAccountList utilities.
    
    Kill itip_addresses_get() and itip_addresses_get_default(), and use
    e_get_account_list() and e_get_default_account() instead.

 calendar/gui/dialogs/event-editor.c                |    3 +-
 calendar/gui/dialogs/event-page.c                  |    5 ++-
 calendar/gui/dialogs/memo-page.c                   |    5 ++-
 calendar/gui/dialogs/task-editor.c                 |    3 +-
 calendar/gui/dialogs/task-page.c                   |    5 ++-
 calendar/gui/e-cal-model.c                         |    3 +-
 calendar/gui/itip-utils.c                          |   37 +++++---------------
 calendar/gui/itip-utils.h                          |    3 --
 mail/em-filter-source-element.c                    |   10 ++---
 modules/calendar/e-cal-shell-view-private.h        |    1 +
 modules/calendar/e-cal-shell-view.c                |    2 +-
 modules/calendar/e-memo-shell-migrate.c            |    9 +++--
 plugins/groupwise-features/camel-gw-listener.c     |    8 +---
 .../groupwise-features/groupwise-account-setup.c   |    4 +-
 plugins/groupwise-features/gw-ui.c                 |    4 ++-
 plugins/itip-formatter/itip-formatter.c            |    5 ++-
 16 files changed, 45 insertions(+), 62 deletions(-)

commit 831e7616c7aee818a304c962bf6007d03a29c2ed
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Apr 25 23:48:39 2011 -0400

    CompEditor cleanups.
    
    Random cleanups from the account-mgmt branch, to reduce diff noise.

 calendar/gui/dialogs/comp-editor-page.c |   31 +-
 calendar/gui/dialogs/comp-editor-page.h |   33 +-
 calendar/gui/dialogs/event-editor.c     |    3 +-
 calendar/gui/dialogs/event-page.c       |  821 ++++++++++++++++---------------
 calendar/gui/dialogs/event-page.h       |    2 -
 calendar/gui/dialogs/task-editor.c      |   56 +--
 calendar/gui/dialogs/task-page.c        |  568 +++++++++++-----------
 calendar/gui/dialogs/task-page.h        |    2 -
 8 files changed, 769 insertions(+), 747 deletions(-)

commit 6c62a6cc48086f50f9c957f9720ef75a416f8305
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Apr 25 19:09:47 2011 -0400

    Some modules missing CFLAGS/LIBS for EShell.

 modules/mailto-handler/Makefile.am  |    6 ++++--
 modules/network-manager/Makefile.am |    4 +++-
 modules/offline-alert/Makefile.am   |    6 ++++--
 modules/plugin-manager/Makefile.am  |    6 ++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

commit 79f7e4534f04a12bac5200ffdd1df48fc17de9ee
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Apr 25 07:14:06 2011 -0400

    EMailBackend: Ignore cancelled background jobs.

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

commit c367bb11764a4635dfd3623060bdb809451b199e
Author: Ivar Smolin <okul@linux.ee>
Date:   Mon Apr 25 10:08:28 2011 +0300

    [l10n] Updated Estonian translation

 po/et.po |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

commit b14bac81b8f3b3fc4124d900b4ef02b831409202
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Sun Apr 24 22:23:38 2011 +0200

    Added UG translation

 po/ug.po | 6336 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3603 insertions(+), 2733 deletions(-)

commit 8cc43a45671aa8e36aeaf0cbe54fcbb10f421aec
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Apr 24 10:12:05 2011 -0400

    Bump gladeui-2.0 minimum version to 3.10.0.

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

commit 918c24dd696eba9d0c0b896da92beeaae0769fcf
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Apr 23 11:36:27 2011 -0400

    Adapt to new CamelSession background job API.

 mail/e-mail-backend.c |  117 +++++++++++++++++++++++++++++++++++++++++++++++--
 mail/e-mail-session.c |   67 +++-------------------------
 2 files changed, 119 insertions(+), 65 deletions(-)

commit dd371855c4b4e6eeb49ee0628fd5a695cabcd339