commit ff986b511c83a0ea0f9013f43572e143f039fba5
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Mon Dec 19 19:26:14 2011 +0530

    News update for 3.3.3 release

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

commit 0b5671411919aa9197f410532a923e2dcafe6a0d
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Mon Dec 19 19:23:17 2011 +0530

    Do not load disabled services while creating new folder

 mail/em-folder-utils.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 2022f95f7bb9574c158282ab94e138ab412a6af7
Author: Rodrigo Moya <rodrigo@gnome-db.org>
Date:   Mon Dec 19 15:52:56 2011 +0100

    schemas: Don't EXTRA_DIST non-existing files

 data/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 83565040a769ece99c736aa382e8c9035997a72c
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Dec 19 14:20:49 2011 +0100

    Bug #666512 - Busy-loop after pressing Send/Receive toolbar button

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

commit 9cb76109646c7b578376616079656a0638986362
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Sun Dec 18 13:45:05 2011 +0100

    Updated Hungarian help translation

 help/hu/hu.po | 2497 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1299 insertions(+), 1198 deletions(-)

commit f470cd27d565d31fd48779aa90e3846983a0e87e
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:   Sat Dec 17 15:57:01 2011 +0100

    Updated German help translation and added 3 new screen-shots.

 help/de/de.po                              | 7185 ++++++++--------------------
 help/de/figures/new-mail-notification.png  |  Bin 0 -> 754482 bytes
 help/de/figures/new-mail-switcher.png      |  Bin 7182 -> 11754 bytes
 help/de/figures/window-overview-layers.png |  Bin 0 -> 156941 bytes
 4 files changed, 2007 insertions(+), 5178 deletions(-)

commit d17065a40d223194714e8c86b82e7adbabadb484
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Dec 17 09:29:11 2011 -0500

    Fix compiler warnings.
    
    gtk_dialog_new_with_buttons() requires some buttons, otherwise use
    gtk_dialog_new() and set title/transient-for/etc properties manually.

 addressbook/gui/merging/eab-contact-merging.c |   43 ++++++++++++++-----------
 addressbook/gui/widgets/eab-gui-util.c        |   22 +++++++++----
 mail/mail-send-recv.c                         |    5 ++-
 3 files changed, 42 insertions(+), 28 deletions(-)

commit 14d333f14e71885e770683010fa0ee48f77a63a0
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Sat Dec 17 13:34:12 2011 +0100

    Finished Hungarian help translation

 help/hu/hu.po |17064 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 9555 insertions(+), 7509 deletions(-)

commit 879925b7f37ccc95fd19d3c6f44f139be47a0506
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Sat Dec 17 13:34:41 2011 +0100

    Fix a few mistranslations in the Hungarian translation

 po/hu.po |  103 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 52 insertions(+), 51 deletions(-)

commit 1dd42c20b14f784065dd78a574609041f6cdf345
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Fri Dec 16 22:00:00 2011 +0100

    Updated Slovenian translation

 po/sl.po |13956 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 7492 insertions(+), 6464 deletions(-)

commit a9cfed5938aef37d95c009411f965ebc185547c1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Dec 16 10:40:37 2011 -0500

    Avoid passing EMailBackend as much as possible.
    
    More mail API churn... reversing some previous API decisions.
    
    I've made some key API changes to EMailSession on the account-mgmt
    branch which should allow for this, and will hopefully also benefit
    the "email-factory" branch.
    
    EMailBackend barely needs to exist anymore, except as the owner of
    EMailSession.
    
    For several low-level functions, we replace its EMailBackend parameter
    with EMailSession and EAlertSink parameters; the latter so it can still
    pass user alerts up the chain.

 mail/e-mail-backend.c                    |   93 +++++++++-----------
 mail/e-mail-backend.h                    |    4 +-
 mail/e-mail-browser.c                    |    4 +-
 mail/e-mail-paned-view.c                 |    7 ++-
 mail/e-mail-reader-utils.c               |   22 +++--
 mail/e-mail-reader.c                     |    4 +-
 mail/e-mail-session.c                    |   18 +----
 mail/e-mail-sidebar.c                    |    6 +-
 mail/e-mail-sidebar.h                    |    3 +-
 mail/em-account-editor.c                 |    8 +-
 mail/em-composer-utils.c                 |    7 --
 mail/em-filter-context.c                 |   50 ++++++------
 mail/em-filter-context.h                 |    6 +-
 mail/em-filter-folder-element.c          |   61 +++++++------
 mail/em-filter-folder-element.h          |    6 +-
 mail/em-filter-source-element.c          |   56 ++++++------
 mail/em-filter-source-element.h          |    6 +-
 mail/em-folder-properties.c              |   54 ++++++------
 mail/em-folder-properties.h              |    9 +-
 mail/em-folder-selection-button.c        |  103 +++++++++++------------
 mail/em-folder-selection-button.h        |   10 +-
 mail/em-folder-selector.c                |   68 ++--------------
 mail/em-folder-selector.h                |    3 -
 mail/em-folder-tree.c                    |  108 +++++++++++------------
 mail/em-folder-tree.h                    |    8 +-
 mail/em-folder-utils.c                   |   52 +++++------
 mail/em-folder-utils.h                   |    7 +-
 mail/em-subscription-editor.c            |   53 ++++++------
 mail/em-subscription-editor.h            |    6 +-
 mail/em-utils.c                          |   68 +++++----------
 mail/em-utils.h                          |    8 +-
 mail/em-vfolder-context.c                |   50 ++++++------
 mail/em-vfolder-context.h                |    6 +-
 mail/em-vfolder-editor.c                 |    6 +-
 mail/em-vfolder-rule.c                   |   66 +++++++--------
 mail/em-vfolder-rule.h                   |    6 +-
 mail/importers/evolution-mbox-importer.c |    3 +-
 mail/mail-autofilter.c                   |   44 +++++-----
 mail/mail-autofilter.h                   |   13 ++--
 mail/mail-ops.c                          |  127 +++++++++------------------
 mail/mail-ops.h                          |    9 +--
 mail/mail-send-recv.c                    |  137 ++++++++++++------------------
 mail/mail-send-recv.h                    |   15 ++--
 mail/mail-vfolder.c                      |  129 ++++++++++++++--------------
 mail/mail-vfolder.h                      |   10 ++-
 mail/message-list.c                      |   90 +++++++++-----------
 mail/message-list.h                      |    6 +-
 modules/mail/e-mail-shell-backend.c      |   12 ++-
 modules/mail/e-mail-shell-sidebar.c      |   12 ++-
 modules/mail/e-mail-shell-view-actions.c |  103 ++++++++++++++++------
 modules/mail/e-mail-shell-view-private.c |   14 ++--
 modules/mdn/evolution-mdn.c              |    8 +-
 plugins/dbx-import/dbx-importer.c        |    3 +-
 plugins/pst-import/pst-importer.c        |    8 ++-
 54 files changed, 822 insertions(+), 973 deletions(-)

commit df85cb1b7a47f713cb775f648f735e642a1bb71b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Dec 16 06:34:13 2011 -0500

    EMailSession: Add "activity-added" signal.
    
    EMailBackend catches these signals and forwards the EActivity to
    e_shell_backend_add_activity().

 mail/e-mail-backend.c |   10 +++++++++-
 mail/e-mail-session.c |   27 +++++++++++++++++++++++++++
 mail/e-mail-session.h |    6 ++++++
 3 files changed, 42 insertions(+), 1 deletions(-)

commit 0427f2cac23a9ccec8590515678bc1ae32c54cf5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Dec 16 00:16:49 2011 -0500

    EShellBackend: Remove unused enum value.

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

commit b95e613147c29af969e20ca87e458a700197630c
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Dec 15 22:35:11 2011 -0500

    mail-send-recv.c: Avoid using EAccount and CamelURL if possible.
    
    EAccount is deprecated and mail URLs are being phased out.
    
    Use EMailAccountStore and CamelService instead.

 mail/e-mail-account-store.c              |   82 ++++++--
 mail/e-mail-account-store.h              |    6 +
 mail/mail-send-recv.c                    |  357 ++++++++++++++++--------------
 mail/mail-send-recv.h                    |    8 +-
 modules/mail/e-mail-shell-view-private.c |   28 ++-
 5 files changed, 286 insertions(+), 195 deletions(-)

commit b888e98c8670da0f0e8eeeadc2372194602c9138
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Dec 16 14:20:23 2011 +0100

    Updated Spanish translation

 po/es.po |  975 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 519 insertions(+), 456 deletions(-)

commit da5776c233facb3279540760b711d08ce358a35e
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Dec 16 10:52:53 2011 +0100

    Bug #661043 - Printing causes email images to download

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

commit 8ec598248077e1d658f3ce4d9252ec12f6be95d6
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Dec 16 10:23:29 2011 +0100

    Bug #666341 - [bbdb] Invalid free in bbdb_do_it

 plugins/bbdb/bbdb.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 9bf243bbed143267902a28dc90299d652471206d
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu Dec 15 23:43:53 2011 +0100

    Updated Galician translations

 po/gl.po | 2540 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1299 insertions(+), 1241 deletions(-)

commit 3170de9357f9238d36d8906ce598769a77c05f0b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Thu Dec 15 23:30:58 2011 +0100

    Updated Galician translations

 po/gl.po | 1397 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 697 insertions(+), 700 deletions(-)

commit a9cea92f5e356655013e20be8f1a94543c9ed72f
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Dec 15 14:45:57 2011 +0100

    Avoid use-after-free in em_config_target_update_settings

 mail/em-config.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 09b17320afb38fc5550f28200935df242c29bf07
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Dec 15 11:31:56 2011 +0100

    Bug #561696 - Invitation's "Open Calendar" button jumps to current day

 modules/calendar/e-cal-shell-backend.c  |    6 +++---
 plugins/itip-formatter/itip-formatter.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit c01655aa3ffed339cf485d162b24fad88b116b30
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Thu Dec 15 12:44:44 2011 +0530

    Fix a crash in pdf_drag_drop. Ref the objects while cloning format_html.

 mail/em-format-html.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

commit d300de403de5b9b2d3c2c2f9d371f59859eeaf8c
Author: pepp <pelloux@gmail.com>
Date:   Thu Dec 15 12:23:52 2011 +0530

    Bug 566793 - Support Drop And Drag Into Nautilus As PDF File

 mail/em-format-html-print.c    |   28 ++++-
 mail/em-format-html-print.h    |    3 +
 mail/em-format-html.c          |   46 +++++++-
 mail/em-format-html.h          |    6 +
 mail/em-utils.c                |  244 ++++++++++++++++++++++++++++++---------
 mail/evolution-mail.schemas.in |   32 +++++
 6 files changed, 289 insertions(+), 70 deletions(-)

commit be607ffe63925ccaa70c33c8f7766c6bf65ad80a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Wed Dec 14 22:34:41 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po | 2062 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1062 insertions(+), 1000 deletions(-)

commit a4f11df843ef2ab53e32c6fd84e3d980e0d092cf
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 14 13:44:08 2011 -0500

    Bug 666081 - Duplicate typedefs
    
    GCC handles it but not valid in C89 or C99.

 mail/e-mail-account-store.h |    7 ++++---
 mail/e-mail-session.h       |    3 ---
 mail/mail-folder-cache.h    |    7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

commit 017f373b5284b4d7177c19e5ac2a142a5362a15c
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Dec 14 14:48:34 2011 +0100

    Bug #582649 - Toggle for coloring today and overdue tasks

 calendar/gui/e-cal-model-tasks.c                 |  113 +++++++++++++++++++++-
 calendar/gui/e-cal-model-tasks.h                 |   10 ++
 calendar/gui/e-task-table.c                      |   33 +++++++
 data/org.gnome.evolution.calendar.gschema.xml.in |   14 +++-
 modules/calendar/e-cal-config-model.c            |   10 ++
 modules/calendar/e-cal-shell-settings.c          |   10 ++
 modules/calendar/e-calendar-preferences.c        |   22 ++++
 modules/calendar/e-calendar-preferences.ui       |   18 ++--
 8 files changed, 215 insertions(+), 15 deletions(-)

commit 10ee75dfdfd41fc35e6307619e891915b6f3cafe
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Dec 14 13:08:16 2011 +0100

    Fix leaks around categories editing
    
    Requires commit 768ca76 in evolution-data-server

 addressbook/gui/contact-editor/e-contact-editor.c |    5 +++--
 e-util/e-categories-config.c                      |    7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

commit 737ad1158fd44e7f8e9231b20ed83bae44c41609
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Dec 14 11:52:51 2011 +0100

    Bug #666106 - libical 0.47 handles CATEGORIES as multiple parameters

 calendar/gui/e-cal-model.c |   69 +++++++++++++++++++++++++++++++-------------
 1 files changed, 49 insertions(+), 20 deletions(-)

commit 26def2a624952219840990f83397a7bb5add49bf
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Dec 14 10:05:11 2011 +0100

    Updated Spanish translation

 po/es.po |  305 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 151 insertions(+), 154 deletions(-)

commit 63404e5dc1d21c07abbaa29d0223695d479523a0
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Dec 13 13:10:30 2011 -0500

    MailFolderCache: Fix a double-free on unsubscribe.
    
    The 'folders' hash table has a GDestroyNotify callback now,
    but we were still freeing the folder_info struct explicitly.

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

commit 034accdf3ba5426db5cab0a6082c7628324e6720
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Dec 13 11:48:07 2011 -0500

    EMSubscriptionEditor: Use alternating row colors.
    
    The deeper the folder the greater the distance between the checkbox and
    the folder name.  Can get difficult to match them on a blank background.

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

commit c9ba92156c91d1e96df18a42c39ec07d15bb7517
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Dec 13 11:45:58 2011 -0500

    EMSubscriptionEditor cleanups.
    
    GQueues are easier to pass around than linked lists.

 mail/em-subscription-editor.c |  382 ++++++++++++++++++++++++-----------------
 1 files changed, 223 insertions(+), 159 deletions(-)

commit 1f4b2854000a9d62f9cc5a425cbb378ec3678565
Author: Alban Browaeys <prahal@yahoo.com>
Date:   Tue Dec 13 09:56:32 2011 -0500

    Bug 665981 - Use OpenStreetMap geoclue provider
    
    Use the OpenStreetMap geoclue provider instead of the deprecated and
    likely disabled Yahoo geoclue v1 API.
    
    Requires geoclue >= 0.12.

 widgets/misc/e-contact-map.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit 55ade610eab71c04195463d0d42b408e06bc7f4f
Author: Alban Browaeys <prahal@yahoo.com>
Date:   Tue Dec 13 09:53:53 2011 -0500

    Bump minimum geoclue version to 0.12.

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

commit 4b6cd5fef38cda89795ade523bcbcb8700cfbcdb
Author: Alban Browaeys <prahal@yahoo.com>
Date:   Tue Dec 13 09:44:16 2011 -0500

    Bug 665980 - Bump minimum champlain-gtk version to 0.12

 configure.ac                 |    6 +++---
 widgets/misc/e-contact-map.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit d459b0885f427588ff5d45c84065a1534034d966
Author: Christophe Fergeau <teuf@gnome.org>
Date:   Tue Dec 13 09:09:05 2011 -0500

    Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM

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

commit bb1e5f60466aeeabee2140cb516ace9259b8731d
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Dec 13 09:14:59 2011 +0100

    Bug #578245 - View settings for threads getting lost

 mail/message-list.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit fdea33689a253c35677713ea9831aa3df7afd595
Author: Jovan Naumovski <jovan3.14@gmail.com>
Date:   Tue Dec 13 00:19:15 2011 +0100

    Updated Macedonian translation.

 po/mk.po |36425 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 17281 insertions(+), 19144 deletions(-)

commit bca0d146daf52c67c5cb8a3a9c2cbcdbf854257a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Dec 12 16:47:38 2011 -0500

    EMAccountEditor: Fix handling of auth-mechanism.
    
    CamelNetworkSettings:auth-mechanism defaults to NULL, so when
    creating a new CamelSettings instance, choose an initial value
    from the CamelProvider's list of available CamelServiceAuthTypes.
    
    This fixes the blank combo box issue and hopefully bug #665984.

 mail/em-account-editor.c |   59 ++++++++++++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 22 deletions(-)

commit f3ec041c74fd35ca66e4d64a22a65649044c3e0b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Dec 12 15:00:55 2011 -0500

    MailFolderCache: Don't respond to "service-added" signals.
    
    Causes folder info queries on disabled accounts.  Instead respond to
    "service-enabled" and "service-disabled" signals, one of which always
    immediately follows "service-added".
    
    Comment this in both MailFolderCache and EMFolderTreeModel.

 mail/em-folder-tree-model.c |    4 +++
 mail/mail-folder-cache.c    |   44 +++++++++++++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 12 deletions(-)

commit 80d5b9a26172291024046224336568bd8e237770
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Dec 12 11:18:05 2011 -0500

    EMailSession: Fix silly mistake in constructed().
    
    Need to load all accounts on startup, even disabled ones.

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

commit 98a0fbb02bdb37a8f651a4b89ce12a797e8a4739
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Dec 11 13:54:24 2011 -0500

    Adapt to camel_session_remove_service() changes.

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

commit 3b8b38a4784256f360e1de992e9aec4e59e48112
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sun Dec 11 19:25:47 2011 +0100

    Updated Spanish translation

 help/es/es.po |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

commit 86c41a532784ec4c0bd842753ee539a797f87fbb
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:   Sun Dec 11 14:00:29 2011 +0100

    User Docs: Grammar and spelling fixes

 help/C/calendar-using-several-calendars.page |    4 ++--
 help/C/mail-encryption-s-mime-manage.page    |    2 +-
 help/C/mail-reading-keyboard-shortcuts.page  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit d126a5c56073faec239736f4fa618e229aa1f43d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sun Dec 11 12:39:57 2011 +0100

    Updated Spanish translation

 po/es.po | 1449 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 722 insertions(+), 727 deletions(-)

commit 7c0c40f83317228e0a725bfb5ca8854339d25588
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Dec 9 10:34:55 2011 -0500

    Reorder accounts by drag-and-drop.
    
    This implements https://bugzilla.gnome.org/show_bug.cgi?id=663527#c3.
    
    Account reordering is now done by drag-and-drop instead of up/down
    buttons.
    
    Turned out to be a wee bit more complicated than I initially thought.
    
    This scraps EAccountManager and EAccountTreeView and replaces them with
    new classes centered around EMailAccountStore, which EMailSession owns.
    
    EMailAccountStore is the model behind the account list in Preferences.
    The folder tree model now uses it to sort its own top-level rows using
    gtk_tree_path_compare().  It also broadcasts account operations through
    signals so we don't have to rely so heavily on EAccountList signals,
    since EAccountList is going away soon.
    
    Also as part of this work, the e-mail-local.h and e-mail-store.h APIs
    have been merged into EMailSession and MailFolderCache.

 capplet/settings/mail-capplet-shell.c             |    5 -
 e-util/e-marshal.list                             |    1 +
 mail/Makefile.am                                  |   10 +-
 mail/e-mail-account-manager.c                     |  565 ++++++++
 mail/e-mail-account-manager.h                     |   78 ++
 mail/e-mail-account-store.c                       | 1439 +++++++++++++++++++++
 mail/e-mail-account-store.h                       |  144 ++
 mail/e-mail-account-tree-view.c                   |  283 ++++
 mail/e-mail-account-tree-view.h                   |   75 ++
 mail/e-mail-backend.c                             |  187 ++--
 mail/e-mail-backend.h                             |    7 -
 mail/e-mail-local.c                               |  154 ---
 mail/e-mail-local.h                               |   39 -
 mail/e-mail-migrate.c                             |   33 +-
 mail/e-mail-reader-utils.c                        |   12 +-
 mail/e-mail-session-utils.c                       |    5 +-
 mail/e-mail-session.c                             |  563 ++++++++-
 mail/e-mail-session.h                             |   20 +
 mail/e-mail-sidebar.c                             |   11 +-
 mail/e-mail-store.c                               |  500 -------
 mail/e-mail-store.h                               |   47 -
 mail/e-mail.h                                     |    2 -
 mail/em-account-editor.c                          |  129 ++-
 mail/em-composer-utils.c                          |   99 +-
 mail/em-composer-utils.h                          |    3 +-
 mail/em-folder-properties.c                       |   23 +-
 mail/em-folder-selection-button.c                 |    5 +-
 mail/em-folder-tree-model.c                       |  438 ++-----
 mail/em-folder-tree-model.h                       |    8 +-
 mail/em-folder-tree.c                             |   54 +-
 mail/em-folder-utils.c                            |   23 +-
 mail/em-utils.c                                   |  206 +---
 mail/em-utils.h                                   |    4 -
 mail/em-vfolder-rule.c                            |    1 -
 mail/importers/evolution-mbox-importer.c          |   10 +-
 mail/importers/mail-importer.c                    |    4 +-
 mail/mail-config.c                                |    1 -
 mail/mail-folder-cache.c                          |  426 +++++--
 mail/mail-folder-cache.h                          |   23 +-
 mail/mail-ops.c                                   |   49 +-
 mail/mail-send-recv.c                             |   47 +-
 mail/mail-vfolder.c                               |   40 +-
 modules/mail/e-mail-shell-backend.c               |   57 +-
 modules/mail/e-mail-shell-view-actions.c          |   71 +-
 modules/mail/e-mail-shell-view-private.c          |   10 +-
 modules/mail/e-mail-shell-view-private.h          |    2 -
 modules/mail/e-mail-shell-view.c                  |    4 +-
 modules/mail/em-account-prefs.c                   |  284 +----
 modules/mail/em-account-prefs.h                   |    6 +-
 modules/mdn/evolution-mdn.c                       |    7 +-
 modules/startup-wizard/evolution-startup-wizard.c |    7 -
 plugins/dbx-import/dbx-importer.c                 |   18 +-
 plugins/pst-import/pst-importer.c                 |   10 +-
 plugins/templates/templates.c                     |   98 +-
 po/POTFILES.in                                    |    8 +-
 widgets/misc/Makefile.am                          |    4 -
 widgets/misc/e-account-manager.c                  |  536 --------
 widgets/misc/e-account-manager.h                  |   83 --
 widgets/misc/e-account-tree-view.c                | 1401 --------------------
 widgets/misc/e-account-tree-view.h                |  132 --
 60 files changed, 4260 insertions(+), 4251 deletions(-)

commit 2f32e1cc68cd416f4530ecc3d2ff08b0e6498d45
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Dec 8 08:58:08 2011 -0500

    Add a hidden --version option.
    
    Required by GNU Coding Standards.

 shell/main.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

commit 8e4fb289d9bc49774d13ff6f97367ebd3b5cf480
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu Dec 8 10:57:42 2011 +0100

    Updated Spanish translation

 help/es/es.po |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit e3b8f3fbb3f1cbd981e8a6382365cd699a95c149
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 23:47:40 2011 -0500

    Move folder URI caching to MailFolderCache.

 mail/mail-folder-cache.c         |  222 ++++++++++++++++++++++++++++++++++++++
 mail/mail-folder-cache.h         |    7 +-
 mail/mail-vfolder.c              |  112 ++++++--------------
 mail/mail-vfolder.h              |    3 -
 modules/mail/e-mail-shell-view.c |   28 ++----
 5 files changed, 270 insertions(+), 102 deletions(-)

commit 60978976388e00a611f2aeb87c9b27e67a2b0f05
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 22:27:16 2011 -0500

    mail_folder_cache_note_store: CamelSession arg is unnecessary.
    
    The CamelStore argument already has the CamelSession:
    
        session = camel_service_get_session (CAMEL_SERVICE (store));

 mail/e-mail-store.c      |    2 +-
 mail/mail-folder-cache.c |    4 +++-
 mail/mail-folder-cache.h |    1 -
 mail/mail-send-recv.c    |    4 +---
 4 files changed, 5 insertions(+), 6 deletions(-)

commit dcc3d40b2c0a78ba75ccae41619cb309ec6006c5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 22:23:21 2011 -0500

    MailFolderCache: Add class methods for signals.

 mail/mail-folder-cache.c |   34 ++++++++++++++++++----------------
 mail/mail-folder-cache.h |   26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 16 deletions(-)

commit a01525c9316b13153cb00fa99cdc587e3ce7c350
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 15:25:02 2011 -0500

    Miscellaneous EShellView-related cleanups.

 modules/addressbook/e-book-shell-backend.c         |   55 +++++-------
 modules/addressbook/e-book-shell-backend.h         |    2 +-
 modules/addressbook/e-book-shell-content.c         |   85 ++++++++----------
 modules/addressbook/e-book-shell-content.h         |    2 +-
 modules/addressbook/e-book-shell-sidebar.c         |   59 +++++-------
 modules/addressbook/e-book-shell-sidebar.h         |    2 +-
 modules/addressbook/e-book-shell-view-actions.c    |   31 ++++---
 modules/addressbook/e-book-shell-view-private.h    |    4 +
 modules/addressbook/e-book-shell-view.c            |    7 +-
 modules/addressbook/evolution-module-addressbook.c |    8 +-
 modules/calendar/e-cal-shell-backend.c             |   66 ++++++--------
 modules/calendar/e-cal-shell-backend.h             |    2 +-
 modules/calendar/e-cal-shell-content.c             |   74 ++++++++--------
 modules/calendar/e-cal-shell-content.h             |    2 +-
 modules/calendar/e-cal-shell-sidebar.c             |   70 +++++++--------
 modules/calendar/e-cal-shell-sidebar.h             |   16 ++--
 modules/calendar/e-cal-shell-view-private.c        |   10 +-
 modules/calendar/e-cal-shell-view-private.h        |    4 +
 modules/calendar/e-cal-shell-view.c                |   17 +++--
 modules/calendar/e-memo-shell-backend.c            |   60 ++++++-------
 modules/calendar/e-memo-shell-backend.h            |    2 +-
 modules/calendar/e-memo-shell-content.c            |   93 +++++++++-----------
 modules/calendar/e-memo-shell-content.h            |    2 +-
 modules/calendar/e-memo-shell-sidebar.c            |   70 +++++++--------
 modules/calendar/e-memo-shell-sidebar.h            |   18 ++--
 modules/calendar/e-memo-shell-view-actions.c       |   13 ++-
 modules/calendar/e-memo-shell-view-private.h       |    4 +
 modules/calendar/e-memo-shell-view.c               |    5 +-
 modules/calendar/e-task-shell-backend.c            |   60 ++++++-------
 modules/calendar/e-task-shell-backend.h            |    2 +-
 modules/calendar/e-task-shell-content.c            |   93 +++++++++-----------
 modules/calendar/e-task-shell-content.h            |    2 +-
 modules/calendar/e-task-shell-sidebar.c            |   70 +++++++--------
 modules/calendar/e-task-shell-sidebar.h            |   20 +++--
 modules/calendar/e-task-shell-view-actions.c       |   13 ++-
 modules/calendar/e-task-shell-view-private.h       |    4 +
 modules/calendar/e-task-shell-view.c               |    5 +-
 modules/calendar/evolution-module-calendar.c       |   18 ++--
 modules/mail/e-mail-shell-backend.c                |   55 +++++-------
 modules/mail/e-mail-shell-backend.h                |    4 +-
 modules/mail/e-mail-shell-content.c                |   76 +++++++----------
 modules/mail/e-mail-shell-content.h                |    2 +-
 modules/mail/e-mail-shell-sidebar.c                |   67 ++++++--------
 modules/mail/e-mail-shell-sidebar.h                |    2 +-
 modules/mail/e-mail-shell-view-actions.c           |   13 ++-
 modules/mail/e-mail-shell-view-private.c           |    3 +-
 modules/mail/e-mail-shell-view-private.h           |    4 +
 modules/mail/e-mail-shell-view.c                   |    9 +-
 modules/mail/evolution-module-mail.c               |    6 +-
 shell/e-shell-switcher.c                           |   10 ++-
 shell/e-shell-window-actions.c                     |    7 +-
 shell/e-shell-window-private.c                     |   37 +++++---
 shell/test/e-test-shell-backend.c                  |    8 --
 shell/test/e-test-shell-view.c                     |   13 ++-
 54 files changed, 656 insertions(+), 730 deletions(-)

commit 8927e9d2e0d2bfc0f0a2cc7821d2ef8658e8670f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 11:16:59 2011 -0500

    Remove unused function vfolder_create_part().

 mail/mail-vfolder.c |    6 ------
 mail/mail-vfolder.h |    1 -
 2 files changed, 0 insertions(+), 7 deletions(-)

commit 6fa0ac14bc0a8e6f1672d5848f7be21c7a456ede
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 11:09:49 2011 -0500

    Remove unused function vfolder_revert().

 mail/mail-vfolder.c |   13 -------------
 mail/mail-vfolder.h |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)

commit 63b393f318dd89330466e48f15396ae44f2cd7ea
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 11:05:26 2011 -0500

    Remove 'vfolder_store' global variable.
    
    Fetch the CamelService by its UID ("vfolder") as needed.

 mail/mail-vfolder.c |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

commit 194ab4aebcca2958d1d9f794086fa997310a6c07
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 10:57:35 2011 -0500

    EMFolderTreeModel: Check for vfolder store by its UID.

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

commit f278751c734c51cb7acfd6f312afb25fca11b57f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Dec 7 10:39:01 2011 -0500

    Remove unnecessary 'vfolder_store' declaration.

 mail/e-mail-store.c   |    1 -
 mail/em-folder-tree.c |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)

commit 16efd93e3d26759add0f30d4e33eb21094b29aa8
Author: Milan Crha <mcrha@redhat.com>
Date:   Wed Dec 7 13:22:58 2011 +0100

    Bug #577322 - Rename of a system ESource doesn't persist

 calendar/gui/dialogs/calendar-setup.c      |   16 +++++++++++++++-
 modules/addressbook/addressbook-config.c   |    5 +++++
 modules/addressbook/e-book-shell-backend.c |    2 +-
 modules/calendar/e-cal-shell-backend.c     |    4 ++--
 modules/calendar/e-memo-shell-backend.c    |    2 +-
 modules/calendar/e-task-shell-backend.c    |    2 +-
 6 files changed, 25 insertions(+), 6 deletions(-)

commit fc359659ae7d14b337eca2f69197f3ff3d688373
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue Dec 6 20:37:02 2011 +0100

    Updated Spanish translation

 po/es.po |  130 +++++++++++++-------------------------------------------------
 1 files changed, 27 insertions(+), 103 deletions(-)

commit f322d1a3bb3cfda2064d71ed65e30ccf86a812e7
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Dec 5 13:27:06 2011 +0100

    Bug #665149 - Do not ref window in e_restore_window()

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

commit 35e14a8d5f99c67418d670dab56929a368c8b509
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sun Dec 4 19:59:48 2011 +0100

    Updated Spanish translation

 po/es.po |  229 +++++++++++++++++---------------------------------------------
 1 files changed, 61 insertions(+), 168 deletions(-)

commit 2b3d2b8821c99b53ca8fba9aba38a29afd514215
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sat Dec 3 22:21:20 2011 +0100

    Updated Galician translations

 po/gl.po |21792 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 11388 insertions(+), 10404 deletions(-)

commit 0d49521fe594d016619b0517b2922b43289b01fe
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Dec 3 12:01:04 2011 +0100

    Updated Spanish translation

 po/es.po | 1497 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 716 insertions(+), 781 deletions(-)

commit 217c83bdb97b32885af56d9ed2d84d96557d6877
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Dec 2 19:00:22 2011 +0100

    Bug #663122 - Doesn't quit on exit with GLib's git master

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

commit 12586e1e10118a8cdfd1bdf70922d25156f08eeb
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Thu Dec 1 18:52:13 2011 +0100

    Updated Norwegian bokmål translation

 po/nb.po |21562 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 11243 insertions(+), 10319 deletions(-)

commit 86da0d52fb48fb783ac766f550bbb297650807e2
Author: Srinivasa Ragavan <sragavan@gnome.org>
Date:   Thu Dec 1 13:26:03 2011 +0200

    Don't explicity show the window. We do gtk_widget_show where we'd want
    it. The capplet flickrs in Meego. Fixes Meego Bugzilla: #20191

 e-util/e-config.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit ee38e42e6ffbaa39e500a547c352cd80f5957bd4
Author: Srinivasa Ragavan <sragavan@gnome.org>
Date:   Thu Dec 1 10:06:09 2011 +0200

    Upstreamed patch from Meego Bugzilla: 23097
    
    When the esource is created, sync it to avoid loose it.

 modules/addressbook/e-book-shell-backend.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit e749abc966ea945d1aa34e6b975d3f2612d3536e
Author: Srinivasa Ragavan <sragavan@gnome.org>
Date:   Thu Dec 1 10:02:16 2011 +0200

    Upstreamed patch from MeeGo Bugzilla: 22945
    
    Check for birthdays which can't be set to future dates.

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

commit 832bea90bf2b29db673a86067f193694a493093a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Nov 30 07:16:08 2011 -0600

    Composer: "mailto" blacklist touch ups.

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

commit 5f9af14a19899dd4350dd32409d43017ccd31f53
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 29 15:20:09 2011 -0600

    EMailReader: Avoid more runtime warnings.

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

commit 91362202055688081b02f254a7c919a365864e4e
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue Nov 29 21:44:46 2011 +0100

    [l10n] Updated German translation

 po/de.po |22391 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 11693 insertions(+), 10698 deletions(-)

commit 06e45c8e87d64c8d5a180115bcdded2f3551a886
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Nov 29 14:48:51 2011 +0100

    Bug #664708 - Composer's headers preference is reset on From change

 composer/e-composer-header-table.c     |   14 ++++++++------
 modules/calendar/e-cal-shell-content.c |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

commit f2b9a4b609b13d51ec1925e7c297e87e17026e33
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Nov 29 14:16:55 2011 +0100

    Bug #665103 - Blank composer/mail/network preferences windows

 e-util/e-config.c                 |    1 -
 mail/em-config.c                  |   22 +++++++++++++++++++---
 mail/em-config.h                  |    8 ++++++++
 modules/mail/e-mail-config-hook.c |    1 +
 modules/mail/em-composer-prefs.c  |    7 ++++---
 modules/mail/em-mailer-prefs.c    |    4 ++++
 modules/mail/em-network-prefs.c   |    4 ++++
 7 files changed, 40 insertions(+), 7 deletions(-)

commit b16c24615186a2a46a052d57f3e494b54d1d3300
Author: Milan Crha <mcrha@redhat.com>
Date:   Tue Nov 29 13:10:13 2011 +0100

    Bug #665123 - Incorrect unref of ESource in pine-importer

 mail/importers/pine-importer.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit f325283cc3c8360d4ec2e191a579ecb238501c23
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 28 23:52:39 2011 -0600

    Avoid a runtime warning in mail_reader_message_seen_cb().

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

commit 59f15906a2dfc2bafd502d5b118c662a7b74bd8c
Author: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date:   Tue Nov 29 04:31:42 2011 +0200

    Updated Romanian translation

 po/ro.po |21464 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 10920 insertions(+), 10544 deletions(-)

commit cac7db8d9a18c258c8ee9a8ee6c6a97fb4c05217
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Mon Nov 28 17:55:02 2011 +0100

    Updated POTFILES.in

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

commit a33d71ebece004365027df05058762388c11e4e1
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Nov 28 11:31:32 2011 +0100

    Remove more "Click \"Forward\" to continue." sentences

 modules/startup-wizard/evolution-startup-wizard.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 20:23:55 2011 -0600

    Remove some unnecessary GConf crud.

 mail/em-config.c                        |   28 ----------------------------
 mail/em-config.h                        |   13 -------------
 modules/mail/e-mail-config-hook.c       |    1 -
 modules/mail/em-composer-prefs.c        |    4 ----
 modules/mail/em-mailer-prefs.c          |    4 ----
 modules/mail/em-mailer-prefs.h          |    2 ++
 modules/mail/em-network-prefs.c         |    4 ----
 plugins/itip-formatter/itip-formatter.c |    6 ++----
 plugins/prefer-plain/prefer-plain.c     |    1 -
 shell/e-shell-window-private.h          |    1 -
 shell/e-shell.h                         |    2 --
 11 files changed, 4 insertions(+), 62 deletions(-)

commit a7699bb29f5ca0c09d68cbad65cd65bedf1307c5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 12:50:56 2011 -0600

    "citation-colour" -> "citation-color"

 data/evolution.convert                       |    2 +-
 data/org.gnome.evolution.mail.gschema.xml.in |    2 +-
 mail/em-format-html.h                        |    2 +-
 modules/mail/e-mail-shell-settings.c         |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit d491963f5cbc1d73214025e4e4a970007046263f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 12:42:56 2011 -0600

    Remove GConfBridge.
    
    No longer needed.

 COPYING                                 |    1 -
 doc/reference/shell/eshell-docs.sgml    |    1 -
 doc/reference/shell/eshell-sections.txt |   17 -
 e-util/Makefile.am                      |    4 +-
 e-util/gconf-bridge.c                   | 1365 -------------------------------
 e-util/gconf-bridge.h                   |  134 ---
 6 files changed, 1 insertions(+), 1521 deletions(-)

commit f6f46ce7fc8950d10eb53e057117a146de5faddc
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 12:40:01 2011 -0600

    Use e_restore_window() and "org.gnome.evolution.window".
    
    Apply it to all windows with persistent size and/or position.

 composer/e-msg-composer.c                       |   13 +--
 data/evolution.convert                          |   54 ++++++++------
 data/org.gnome.evolution.mail.gschema.xml.in    |   91 ++---------------------
 data/org.gnome.evolution.shell.gschema.xml.in   |   26 +------
 mail/e-mail-browser.c                           |   14 ++--
 mail/em-filter-editor.c                         |   13 +--
 mail/em-subscription-editor.c                   |   10 +-
 mail/em-vfolder-editor.c                        |   13 +--
 mail/mail-send-recv.c                           |   16 ++--
 modules/addressbook/e-book-shell-view-private.h |    1 -
 modules/calendar/e-memo-shell-view-private.h    |    1 -
 modules/calendar/e-task-shell-view-private.h    |    1 -
 modules/mail/e-mail-shell-view-private.h        |    1 -
 modules/mail/em-composer-prefs.c                |    1 -
 shell/e-shell-window-private.c                  |    8 +-
 shell/e-shell-window-private.h                  |    1 -
 16 files changed, 78 insertions(+), 186 deletions(-)

commit 15da8fa99012875735ffa3a1eb54670b6d42bea4
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 12:37:54 2011 -0600

    Add e_restore_window().
    
    Replaces gconf_bridge_bind_window().
    
    Requires a GSettings path to a "org.gnome.evolution.window" schema.

 e-util/e-util.c |  225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 e-util/e-util.h |    8 ++
 2 files changed, 233 insertions(+), 0 deletions(-)

commit beb8b31cd4936483ab140b52cdeb6f5d9ee6a4be
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 27 12:36:50 2011 -0600

    Add relocatable "org.gnome.evolution.window" schema.
    
    Holds window size and position values.

 data/org.gnome.evolution.gschema.xml.in |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

commit 0206149d015e609fe80428385b5c63288e28bf99
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Nov 26 13:54:53 2011 +0100

    Updated Spanish translation

 po/es.po |13995 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 7598 insertions(+), 6397 deletions(-)

commit a65a473bfc4ac010c0a2c0bcfe55ff051e38a32a
Author: Xandru Armesto <xandru@softastur.org>
Date:   Fri Nov 25 20:28:09 2011 +0100

    Updated asturian language

 po/ast.po |16140 ++++++++++++++++++++++---------------------------------------
 1 files changed, 5756 insertions(+), 10384 deletions(-)

commit 30717998cac73c0a2199e7b96fa2399113decd4a
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Nov 25 16:45:28 2011 +0100

    Bug #580394 - Comment field in a meeting request is too small

 plugins/itip-formatter/itip-formatter.c |    7 ++++-
 plugins/itip-formatter/itip-view.c      |   36 ++++++++++++++++++++++--------
 plugins/itip-formatter/itip-view.h      |    2 +-
 3 files changed, 32 insertions(+), 13 deletions(-)

commit 993d4910c16bc1f8cf1d0b2ad69f8b4ea324f7f7
Author: Tim Piessens <piessens@icsense.com>
Date:   Fri Nov 25 14:36:42 2011 +0100

    Bug #616561 - Don't check read-only calendars in the itip-formatter

 plugins/itip-formatter/itip-formatter.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit eabcec7ecf6ab774f382c3b1336883bebb5077c2
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Nov 25 12:43:53 2011 +0100

    Bug #376075 - Accepting a meeting invitation defaults to wrong calendar

 plugins/itip-formatter/itip-formatter.c |   59 +++++++++++++++++--------------
 1 files changed, 32 insertions(+), 27 deletions(-)

commit 8664187d640655a6c1fc44e99937ea8037cf4932
Author: Milan Crha <mcrha@redhat.com>
Date:   Fri Nov 25 11:40:28 2011 +0100

    Bug #659491 - Hung when accepting calendar invite

 plugins/itip-formatter/itip-formatter.c |  757 +++++++++++++++++++------------
 plugins/itip-formatter/itip-view.c      |    5 +
 2 files changed, 468 insertions(+), 294 deletions(-)

commit c8fcaf727d7bf60a83219f8d1751cff9e43dfee8
Author: Josselin Mouette <joss@malsain.org>
Date:   Thu Nov 24 18:22:08 2011 -0500

    Bug 664753 - Avoid unnecessary requirements in evolution-shell-3.0.pc
    
    gnome-desktop-3.0 is a private requirement.

 evolution-shell.pc.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit b2022f6d3c01ba651b91aa8734274e2093997461
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 18:02:33 2011 -0500

    Remove almost all *_DISABLED_DEPRECATED_FLAGS.
    
    Leave the EDS macros alone since we control them.
    
    I'll care about deprecated APIs again when a gtk4 release date is
    announced.  Meanwhile it's just causing distros unnecessary pain.

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

commit 2ec4461822cc280a440a7279f46e2900405d8fb2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 17:49:14 2011 -0500

    Remove *_DISABLE_SINGLE_INCLUDES macros.
    
    We already comply, and it's required now anyway for gtk3.

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

commit ad1581d50cdab9c56cdad61331f760a23f81b9de
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 12:29:35 2011 -0500

    Remove e_shell_get_gconf_client().
    
    No longer needed.

 doc/reference/shell/eshell-sections.txt |    1 -
 shell/e-shell.c                         |   24 ------------------------
 shell/e-shell.h                         |    1 -
 3 files changed, 0 insertions(+), 26 deletions(-)

commit 8fa08de8892b288a0fcc48a21375553f994f975e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 12:02:59 2011 -0500

    Bug 664654 - Sanitize subjects before suggesting a save filename

 shell/e-shell-utils.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

commit 4169ce41cc34d992ebd63b1bcc8f604e69aea89a
Author: Milan Crha <mcrha@redhat.com>
Date:   Thu Nov 24 16:35:59 2011 +0100

    Bug #664634 - Deadlock when processing completed tasks filter

 calendar/gui/e-cal-model.c                   |    2 +
 calendar/gui/e-task-table.c                  |  232 +++++++++++++++-----------
 modules/calendar/e-task-shell-view-private.c |   30 +++-
 modules/calendar/e-task-shell-view-private.h |    1 +
 4 files changed, 159 insertions(+), 106 deletions(-)

commit 2eb60688a1955a95c3a040bd98f76bb67e3ff3ed
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 10:25:28 2011 -0500

    Bug 664707 - Tasks & Memos panel size not remembered

 data/org.gnome.evolution.calendar.gschema.xml.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 86e6df6bbd4c4b1f6e4018671b5d06147161e831
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Nov 24 00:15:32 2011 -0500

    Bug 664678 - Bad defaults for SpamAssassin GSettings keys
    
    These need to be changed manually if the defaults are not suitable.
    These do not appear in Evolution's user interface.

 ...org.gnome.evolution.spamassassin.gschema.xml.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit cafd601e62b92192f9acc6aa8f7de17125c3fb15
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed Nov 23 23:22:28 2011 +0100

    Updated POTFILES.in

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

commit 44df5ec064bc4d4d36e891aefd9ec6fc4a2ad8a9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Nov 23 12:12:15 2011 -0500

    Cosimo's spidey senses pointed him to a memory leak.

 widgets/table/e-table-field-chooser-item.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8
Merge: fa1bb9a e64d6fe
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 20:48:44 2011 -0500

    Merge branch 'wip/gsettings'

commit e64d6fe05c30c2cc1d7625a202afba3ba2da07cd
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 18:22:14 2011 -0500

    Miscellaneous cleanups.

 calendar/gui/alarm-notify/alarm-notify.c           |    3 +-
 calendar/gui/alarm-notify/alarm.c                  |    1 -
 calendar/gui/alarm-notify/alarm.h                  |    1 -
 calendar/gui/calendar-config.c                     |    2 +-
 calendar/gui/calendar-view-factory.c               |    1 -
 calendar/gui/calendar-view.c                       |    1 -
 calendar/gui/comp-util.c                           |    1 -
 calendar/gui/dialogs/alarm-dialog.c                |    1 -
 calendar/gui/dialogs/alarm-list-dialog.c           |    1 -
 calendar/gui/dialogs/cancel-comp.c                 |    1 -
 calendar/gui/dialogs/changed-comp.c                |    1 -
 calendar/gui/dialogs/comp-editor-util.c            |    1 -
 calendar/gui/dialogs/delete-comp.c                 |    1 -
 calendar/gui/dialogs/delete-error.c                |    1 -
 calendar/gui/dialogs/recur-comp.c                  |    1 -
 calendar/gui/dialogs/send-comp.c                   |    1 -
 calendar/gui/e-day-view-time-item.c                |    2 +-
 calendar/gui/itip-utils.c                          |   10 ++--
 composer/e-composer-private.h                      |   24 --------
 composer/e-msg-composer.c                          |   30 ++++-----
 e-util/e-datetime-format.c                         |    4 +-
 e-util/e-util.c                                    |    2 +-
 libgnomecanvas/gnome-canvas-pixbuf.c               |    1 -
 libgnomecanvas/gnome-canvas-text.c                 |    1 -
 mail/e-mail-label-list-store.c                     |   30 +++++++---
 mail/e-mail-session.c                              |    8 +-
 mail/em-account-editor.c                           |   63 ++++++++++++++------
 mail/em-config.c                                   |    1 -
 mail/em-subscription-editor.c                      |   45 +++++++-------
 mail/mail-config.c                                 |   20 +++---
 modules/addressbook/e-book-shell-view-private.c    |    4 +-
 modules/calendar/e-cal-shell-backend.c             |    2 +-
 modules/calendar/e-memo-shell-backend.c            |    3 +-
 modules/calendar/e-task-shell-backend.c            |    4 +-
 modules/online-accounts/e-online-accounts-google.c |    2 +-
 modules/spamassassin/evolution-spamassassin.c      |    4 -
 plugins/mail-to-task/mail-to-task.c                |    8 ++-
 plugins/mark-all-read/mark-all-read.c              |    1 -
 plugins/pst-import/pst-importer.c                  |    9 ++-
 plugins/templates/templates.c                      |    2 +-
 shell/e-shell-backend.c                            |   11 ++-
 shell/e-shell-searchbar.c                          |    9 ++-
 shell/e-shell-settings.c                           |   17 +++--
 shell/e-shell-sidebar.c                            |   17 +++--
 shell/e-shell-switcher.c                           |   19 ++++---
 shell/e-shell-taskbar.c                            |   11 ++-
 shell/e-shell-view.c                               |   11 ++-
 shell/e-shell-window-private.h                     |    4 +
 shell/e-shell-window.c                             |    3 +-
 49 files changed, 211 insertions(+), 190 deletions(-)

commit 2e60b6a4a21105bb4a1e2badd1be51b3e684d165
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 17:53:07 2011 -0500

    Tweak GSettings schemas.
    
    - Don't use the term "eplugin" for modules.
    
    - Use the term "plugin" instead of "eplugin" for plugins.
    
    - Split SpamAssassin settings into a separate schema.

 data/Makefile.am                                   |   21 ++++----
 data/evolution.convert                             |   36 ++++++++-------
 data/org.gnome.evolution.bogofilter.gschema.xml.in |    9 ++++
 ...tion.eplugin.attachment-reminder.gschema.xml.in |    9 ----
 ...e.evolution.eplugin.autocontacts.gschema.xml.in |   39 ----------------
 ...nome.evolution.eplugin.bogo-junk.gschema.xml.in |    9 ----
 ...tion.eplugin.email-custom-header.gschema.xml.in |    9 ----
 ...volution.eplugin.external-editor.gschema.xml.in |   14 ------
 ...e.evolution.eplugin.face-picture.gschema.xml.in |    9 ----
 ...org.gnome.evolution.eplugin.itip.gschema.xml.in |    9 ----
 ...lution.eplugin.mail-notification.gschema.xml.in |   49 --------------------
 ...e.evolution.eplugin.prefer-plain.gschema.xml.in |   14 ------
 ...nome.evolution.eplugin.templates.gschema.xml.in |    9 ----
 data/org.gnome.evolution.mail.gschema.xml.in       |   25 ----------
 ...ution.plugin.attachment-reminder.gschema.xml.in |    9 ++++
 ...me.evolution.plugin.autocontacts.gschema.xml.in |   39 ++++++++++++++++
 ...ution.plugin.email-custom-header.gschema.xml.in |    9 ++++
 ...evolution.plugin.external-editor.gschema.xml.in |   14 ++++++
 ...me.evolution.plugin.face-picture.gschema.xml.in |    9 ++++
 .../org.gnome.evolution.plugin.itip.gschema.xml.in |    9 ++++
 ...olution.plugin.mail-notification.gschema.xml.in |   49 ++++++++++++++++++++
 ...me.evolution.plugin.prefer-plain.gschema.xml.in |   14 ++++++
 ...gnome.evolution.plugin.templates.gschema.xml.in |    9 ++++
 ...org.gnome.evolution.spamassassin.gschema.xml.in |   29 ++++++++++++
 mail/em-composer-utils.c                           |    2 +-
 modules/bogofilter/evolution-bogofilter.c          |    2 +-
 modules/spamassassin/evolution-spamassassin.c      |   27 ++++++++--
 plugins/attachment-reminder/attachment-reminder.c  |    4 +-
 plugins/bbdb/bbdb.h                                |    2 +-
 plugins/external-editor/external-editor.c          |   10 ++--
 plugins/face/face.c                                |    4 +-
 plugins/itip-formatter/itip-formatter.c            |    6 +-
 plugins/mail-notification/mail-notification.c      |   10 ++--
 plugins/prefer-plain/prefer-plain.c                |    2 +-
 plugins/templates/templates.c                      |    2 +-
 35 files changed, 272 insertions(+), 250 deletions(-)

commit adf6645d525842692ca625a278e41a66cd02d2b6
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 15:54:39 2011 -0500

    Fix some GSettings runtime issues.

 data/Makefile.am                                   |    2 +-
 data/evolution.convert                             |   27 ++++++++++---------
 ...e.evolution.eplugin.prefer-plain.gschema.xml.in |    2 +-
 data/org.gnome.evolution.mail.gschema.xml.in       |    5 +++
 mail/mail-config.c                                 |    3 +-
 modules/mail/e-mail-shell-settings.c               |    2 +-
 modules/mail/em-mailer-prefs.c                     |   26 +++++++++++-------
 modules/spamassassin/evolution-spamassassin.c      |    2 +-
 8 files changed, 41 insertions(+), 28 deletions(-)

commit 265873082d31c97d2af8c3f395e0165cb174f2ea
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 15:41:51 2011 -0500

    Include git.mk in mail/mail-autoconfig/Makefile.am.

 mail/mail-autoconfig/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit faf6eb96ab0848e96e1a84c51842594461b7bc00
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 15:17:41 2011 -0500

    Remove .gitignore from git - we generate this file.

 .gitignore |   33 ---------------------------------
 1 files changed, 0 insertions(+), 33 deletions(-)

commit 2e24e72b5ecb2684bfd5651a57c2600397b61c51
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 15:15:03 2011 -0500

    More compiler warning fixes.

 mail/em-account-editor.c                 |   12 ++++++++----
 modules/mail/e-mail-shell-view-actions.c |    1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

commit 00e495279937c6495d6fab99fe7f89583859ecd1
Merge: 0c83b9b f3abed7
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 14:52:33 2011 -0500

    Merge branch 'master' into wip/gsettings
    
    Conflicts:
    	mail/e-mail-paned-view.c

commit 0c83b9b25d967ce6d6793ef851e86bc272a2f129
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Nov 18 09:09:48 2011 -0500

    Miscellaneous cleanups.

 .../gui/contact-editor/e-contact-quick-add.c       |    1 +
 addressbook/gui/merging/eab-contact-compare.c      |    1 +
 calendar/gui/alarm-notify/alarm-notify.c           |    9 +++--
 composer/e-msg-composer.c                          |    8 ++--
 e-util/e-plugin.c                                  |    6 ++--
 e-util/e-signature-list.c                          |    6 +++-
 e-util/e-signature-utils.c                         |    3 +-
 mail/e-mail-label-list-store.c                     |   26 +++++++++------
 mail/e-mail-session.c                              |    4 ++-
 mail/em-utils.c                                    |    7 ++--
 mail/mail-config.c                                 |   35 ++++++++++++--------
 modules/bogofilter/evolution-bogofilter.c          |    5 ++-
 modules/calendar/e-cal-shell-backend.c             |   14 ++++----
 modules/calendar/e-memo-shell-backend.c            |   14 ++++----
 modules/calendar/e-task-shell-backend.c            |   14 ++++----
 modules/mail/em-mailer-prefs.c                     |   22 ++++++------
 shell/e-shell-settings.c                           |    4 ++-
 shell/e-shell.c                                    |   11 ++++--
 18 files changed, 110 insertions(+), 80 deletions(-)

commit c75f58d01bb7bbe139cd73a85894dc5f50185816
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Nov 18 09:58:44 2011 -0500

    Fix compiler warnings.

 calendar/gui/alarm-notify/config-data.c         |    2 +-
 calendar/gui/gnome-cal.c                        |    1 -
 capplet/settings/mail-account-view.c            |    3 +--
 composer/e-msg-composer.c                       |    4 +---
 e-util/e-plugin.c                               |    5 +++--
 em-format/em-format.c                           |    2 --
 mail/e-mail-attachment-bar.c                    |    1 -
 mail/e-mail-browser.c                           |    1 -
 mail/e-mail-label-list-store.c                  |    4 +++-
 mail/e-mail-reader.c                            |    1 -
 mail/e-mail-session.c                           |    2 --
 mail/em-composer-utils.c                        |    2 --
 mail/em-folder-properties.c                     |    1 -
 mail/message-list.c                             |    1 -
 modules/addressbook/e-book-shell-view-actions.c |    1 -
 modules/calendar/e-cal-shell-content.c          |    1 -
 modules/calendar/e-cal-shell-sidebar.c          |    1 -
 modules/calendar/e-memo-shell-view-actions.c    |    1 -
 modules/mail/e-mail-shell-backend.c             |    4 ----
 plugins/itip-formatter/itip-formatter.c         |    5 +++--
 plugins/save-calendar/rdf-format.c              |    2 --
 shell/e-shell-migrate.c                         |    1 -
 shell/e-shell-settings.c                        |    1 -
 shell/e-shell.c                                 |    5 ++---
 widgets/table/e-table-field-chooser-item.c      |    1 -
 25 files changed, 14 insertions(+), 39 deletions(-)

commit fa1bb9a17e11cf12ce02d9b49bba2753f6020ea0
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue Nov 22 17:23:08 2011 +0100

    Updated Spanish translation

 po/es.po | 1362 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 683 insertions(+), 679 deletions(-)

commit f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Nov 22 01:29:21 2011 -0500

    Bug 585066 - Add Auto-Submitted header to outgoing MDNs
    
    Also set the disposition field according to user preferences.
    
    If the MDN is sent without user confirmation ("always"), use:
    
       Disposition: automatic-action/MDN-sent-automatically;displayed
    
    If the MDN is sent in response to user confirmation ("ask"), use:
    
       Disposition: manual-action/MDN-sent-manually;displayed

 modules/mdn/evolution-mdn.c |   89 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 79 insertions(+), 10 deletions(-)

commit c4fedc04941946b2e79bf7a4d5cdb4f34dcd4cbd
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 01:01:51 2011 -0500

    Split MDN handling into a module.

 configure.ac                        |    1 +
 mail/e-mail-reader.c                |   35 +--
 mail/em-composer-utils.c            |  263 ------------------
 mail/em-composer-utils.h            |    7 -
 mail/mail.error.xml                 |    7 -
 modules/Makefile.am                 |    1 +
 modules/mdn/Makefile.am             |   36 +++
 modules/mdn/evolution-mdn.c         |  500 +++++++++++++++++++++++++++++++++++
 modules/mdn/evolution-mdn.error.xml |    9 +
 po/POTFILES.in                      |    2 +
 10 files changed, 560 insertions(+), 301 deletions(-)

commit 2b8701fa2b3925ab94231884e211bbcdada5359f
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 13:20:08 2011 -0500

    EPreviewPane: Implement EAlertSink.
    
    Means EMailBrowser no longer has to.
    
    Also, EMailReader now provides a default implementation for
    get_alert_sink() which just calls get_preview_pane() and casts.

 mail/e-mail-browser.c               |   58 -----------------------------
 mail/e-mail-reader.c                |   11 +++++
 modules/mail/e-mail-shell-content.c |   15 -------
 widgets/misc/e-preview-pane.c       |   70 ++++++++++++++++++++++++++++++++++-
 widgets/misc/e-preview-pane.h       |    1 +
 5 files changed, 80 insertions(+), 75 deletions(-)

commit 451179909849e4e4058180f095e6ae889d97b797
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 18:51:00 2011 -0500

    EAlertBar: Add a close button to all alerts.
    
    Replaces the 'Dismiss' button.  All alerts appearing in an alert bar
    should be dismissable (i.e. non-modal).  For modal alerts use a dialog.

 e-util/e-alert.c                                   |   12 -
 .../evolution-offline-alert.error.xml              |    2 -
 widgets/misc/e-alert-bar.c                         |  216 +++++++++++++-------
 widgets/misc/e-alert-bar.h                         |    1 +
 4 files changed, 146 insertions(+), 85 deletions(-)

commit 5fabd29bd2580bbe479034634b405abfa36bb500
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 12:42:34 2011 -0500

    Add EMailReader.get_preview_pane() method.
    
    Also give EMailReader::show-search-bar signal a default implementation,
    since it can now dig up the search bar widget itself.

 mail/e-mail-browser.c               |   32 +++++-----
 mail/e-mail-notebook-view.c         |   36 ++++++------
 mail/e-mail-paned-view.c            |   51 +++++++----------
 mail/e-mail-paned-view.h            |    1 -
 mail/e-mail-reader.c                |   23 ++++++++
 mail/e-mail-reader.h                |    3 +
 modules/mail/e-mail-shell-content.c |  105 ++++++++++++++++++-----------------
 7 files changed, 135 insertions(+), 116 deletions(-)

commit f9ffebc2f7a6fb285e686133dcccf17766c2ba79
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 09:51:03 2011 -0500

    Mail widget cleanups.

 mail/Makefile.am                  |   44 +++---
 mail/e-mail-attachment-bar.c      |  132 ++++++++-----------
 mail/e-mail-browser.c             |   69 +++++-----
 mail/e-mail-display.c             |   65 +++------
 mail/e-mail-folder-pane.c         |    9 +-
 mail/e-mail-label-action.c        |   41 +-----
 mail/e-mail-label-dialog.c        |   46 ++-----
 mail/e-mail-label-list-store.c    |   81 ++++--------
 mail/e-mail-label-manager.c       |   45 ++-----
 mail/e-mail-label-tree-view.c     |   42 +-----
 mail/e-mail-message-pane.c        |    9 +-
 mail/e-mail-notebook-view.c       |  200 ++++++++++++++++++-----------
 mail/e-mail-paned-view.c          |   71 ++++++-----
 mail/e-mail-tab-picker.c          |   97 ++++++++------
 mail/e-mail-tab-picker.h          |  143 ++++++++++-----------
 mail/e-mail-tab.c                 |   93 ++++++++------
 mail/e-mail-tab.h                 |  152 ++++++++++++----------
 mail/e-mail-tag-editor.c          |   42 ++-----
 mail/e-mail-view.c                |    9 +-
 mail/em-account-editor.c          |   46 ++-----
 mail/em-config.c                  |    2 +-
 mail/em-config.h                  |   19 +++
 mail/em-event.c                   |    2 +-
 mail/em-event.h                   |   19 +++
 mail/em-filter-context.c          |   11 +-
 mail/em-filter-editor.c           |   34 +-----
 mail/em-filter-rule.c             |  102 +++++----------
 mail/em-folder-selection-button.c |    2 +-
 mail/em-folder-tree.c             |    2 +-
 mail/em-format-hook.c             |   76 +++++-------
 mail/em-format-html-display.c     |   56 +++------
 mail/em-format-html-print.c       |   40 +-----
 mail/em-format-html.c             |    9 +-
 mail/em-search-context.c          |   40 +-----
 mail/em-vfolder-context.c         |   11 +-
 mail/em-vfolder-rule.c            |   10 +-
 mail/mail-folder-cache.c          |  257 +++++++++++++++++++------------------
 mail/message-list.c               |   59 +++------
 38 files changed, 976 insertions(+), 1211 deletions(-)

commit 6f3b2df27f1bcd71880879bf8236663b72002086
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 01:02:26 2011 -0500

    Make EMailNotebookView and EMailPanedView extensible.
    
    Since they each implement EMailReader.

 mail/e-mail-notebook-view.c |    6 +++++-
 mail/e-mail-paned-view.c    |   18 ++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

commit c668a350283bfe09edbb39303f655ba2b638eae9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Nov 21 20:39:23 2011 -0500

    Add EMailReader:message-loaded signal.
    
    Emitted when the CamelMimeMessage has been obtained.

 mail/e-mail-reader.c |  138 +++++++++++++++++++++++++++++++-------------------
 mail/e-mail-reader.h |    3 +
 2 files changed, 89 insertions(+), 52 deletions(-)

commit aecfbc5813a177c18f0031b47af7729206427f1e
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 20 19:03:34 2011 -0500

    Add EMailReader:message-seen signal.
    
    Replaces e_mail_reader_mark_as_read().

 e-util/e-marshal.list      |    1 +
 mail/e-mail-reader-utils.c |   32 ---------------
 mail/e-mail-reader-utils.h |    2 -
 mail/e-mail-reader.c       |   92 +++++++++++++++++++++++++++++++++++--------
 mail/e-mail-reader.h       |    7 ++-
 5 files changed, 81 insertions(+), 53 deletions(-)

commit 10376436225014326f7cd55f14f4b26c245a3198
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Nov 21 18:38:26 2011 +0100

    Bug #663615 - Saving calendar duplicates the first event

 plugins/save-calendar/csv-format.c  |    2 +-
 plugins/save-calendar/ical-format.c |    2 +-
 plugins/save-calendar/rdf-format.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit a8e8c4612266db75e1f1a7a489ba3545215eb02f
Author: Milan Crha <mcrha@redhat.com>
Date:   Mon Nov 21 17:53:17 2011 +0100

    Bug #664018 - Cannot create task/memo from a mail

 plugins/mail-to-task/mail-to-task.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

commit 03c039c098314b94767a2ec81b73c40fb4cbc168
Merge: f5799c4 c2c8a5a
Author: Rodrigo Moya <rodrigo@gnome-db.org>
Date:   Mon Nov 21 10:14:32 2011 +0100

    Merge branch 'master' into wip/gsettings

commit c2c8a5af8b9820123f7e8058ee00cfc4881050ae
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Nov 21 01:46:33 2011 +0100

    Updated Galician translations

 po/gl.po | 1190 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 603 insertions(+), 587 deletions(-)

commit ef5ae3639429cb6f9d657ac70d014e5904ac258b
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Nov 20 17:36:39 2011 -0500

    Post-release version bump.

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