commit 48002aea6233c68a8104f380ed134eb1b67a90b2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 23 12:27:30 2011 -0500

    NEWS update for 3.1.4 release.

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

commit 4941d7ea79914299c81fbd39bb7c60a3201a5f25
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 22 09:40:37 2011 -0500

    Coding style and whitespace cleanups.

 .../contact-list-editor/e-contact-list-editor.h    |    6 +-
 modules/addressbook/openldap-extract.h             |  377 ++++++++++----------
 smime/gui/certificate-manager.h                    |    1 -
 3 files changed, 198 insertions(+), 186 deletions(-)

commit 002ad0610fca3476703bfd4245a1bc25584dfd24
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sat Jul 23 14:31:44 2011 +0200

    Updated Spanish translation

 po/es.po | 1220 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 617 insertions(+), 603 deletions(-)

commit 41c378f71ce43393e3915d8d172891fb6014986b
Author: Punit Jain <jpunit@novell.com>
Date:   Thu Jul 21 19:26:58 2011 +0530

    error in mail notification

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

commit e2a39dfe3541a1b8546fa9b39eb8f97e2db9a472
Author: Marek Černocký <marek@manet.cz>
Date:   Tue Jul 19 22:22:06 2011 +0200

    Updated Czech translation

 po/cs.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 67f8c4f09558aa6164cfe66f57391513465223a5
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 19 09:23:56 2011 -0500

    SpamAssassin: Add a missing linker flag.

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

commit 25c1c0fd4569da40ae4331582c477df3d6389d34
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 18 13:30:27 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 1145 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 546 insertions(+), 599 deletions(-)

commit 477419673becac217d680a8a0801f71eb4b72691
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Mon Jul 18 08:47:06 2011 +0200

    Updated POTFILES.in

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

commit 39c14c53de640f9131cf511f5e0dbb6eb4d600a7
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Fri Jul 15 08:57:17 2011 -0400

    EMailBackend: Explicitly remove CamelServices during dispose.
    
    Calling camel_session_remove_services() while disposing of our
    CamelSession instance can help break reference cycles and ensures
    the CamelServices get finalized properly.

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

commit 44e007e171208094f5d763f5826064fc71071b51
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Fri Jul 15 11:27:49 2011 +0530

    Make "open_calendar" function as expected.

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

commit 8c2d09db62c0f9a2c8b168bcd8d827c05d4452ae
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 14 23:43:51 2011 -0400

    SpamAssassin: Silence spamd's debugging chatter.

 modules/spamassassin/evolution-spamassassin.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 794bc489206ab19a6f819f2fdf477fbcf8109d23
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 14 13:50:30 2011 -0400

    SpamAssassin: Try harder to kill spamd on exit.
    
    References to EMailSession are leaking like crazy, so the module's
    finalize() method never gets called, and we never kill our spamd.
    
    Until I can track down all the reference leaks, kill the spamd process
    in response to a "EShell::prepare-for-quit" signal instead of from the
    module's finalize() method.  (Maybe that's a better long-term solution
    anyway?)

 modules/spamassassin/evolution-spamassassin.c |   91 ++++++++++++++----------
 1 files changed, 53 insertions(+), 38 deletions(-)

commit 0d3c32b33cdac3ef36aeb6c42cbed1bd7df8f91d
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 14 12:05:49 2011 -0400

    SpamAssassin: Don't wait for termination when spawning spamd.

 modules/spamassassin/evolution-spamassassin.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

commit 8dfd4278a78e7d6ae30f92d50ee46029a5fbd106
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 12 07:06:12 2011 -0400

    Convert junk filtering EPlugins to EExtensions.
    
    We now have a proper junk mail filtering API.  All junk filtering
    extensions must subclass EMailJunkFilter for user preferences and
    availability testing, and implement the CamelJunkFilter interface
    for the actual junk filtering and learning operations.
    
    The bogofilter module should be feature-equivalent to its former
    EPlugin.  The spamassassin module is far more complex.  It's nearly
    feature-equivalent to its former EPlugin, but I ditched the spamd
    respawning code since it seemed unnecessary for a mail client to
    have to deal with.  If there's a huge outcry from users about it
    I'll reluctantly put it back, but I don't expect one.
    
    This gets us a step closer to killing off EConfig, and eventually
    the EPlugin framework itself.

 configure.ac                                       |   12 +-
 mail/Makefile.am                                   |    6 +-
 mail/e-mail-junk-filter.c                          |   82 +
 mail/e-mail-junk-filter.h                          |   74 +
 mail/e-mail-junk-options.c                         |  372 +
 mail/e-mail-junk-options.h                         |   67 +
 mail/e-mail-session.c                              |  273 +-
 mail/e-mail-session.h                              |    6 +-
 mail/em-junk.c                                     |   35 -
 mail/em-junk.h                                     |   65 -
 mail/evolution-mail.schemas.in                     |   28 -
 mail/mail-config.ui                                | 7319 +++++++++++---------
 maint/evolution.xml                                |    5 +-
 modules/Makefile.am                                |    2 +
 modules/bogofilter/Makefile.am                     |   57 +
 modules/bogofilter/evolution-bogofilter.c          |  524 ++
 modules/bogofilter/evolution-bogofilter.schemas.in |   20 +
 modules/mail/Makefile.am                           |    2 -
 modules/mail/e-mail-junk-hook.c                    |  344 -
 modules/mail/e-mail-junk-hook.h                    |   66 -
 modules/mail/em-mailer-prefs.c                     |  164 +-
 modules/mail/em-mailer-prefs.h                     |    6 -
 modules/mail/evolution-module-mail.c               |    2 -
 modules/spamassassin/Makefile.am                   |   56 +
 modules/spamassassin/evolution-spamassassin.c      | 1177 ++++
 .../spamassassin/evolution-spamassassin.schemas.in |   33 +
 plugins/bogo-junk-plugin/Makefile.am               |   67 -
 plugins/bogo-junk-plugin/README                    |   35 -
 plugins/bogo-junk-plugin/bf-junk-filter.c          |  420 --
 .../bogo-junk-plugin/bogo-junk-plugin.schemas.in   |   18 -
 .../org-gnome-bogo-junk-plugin.eplug.xml           |   26 -
 plugins/sa-junk-plugin/Makefile.am                 |   31 -
 plugins/sa-junk-plugin/em-junk-filter.c            |  966 ---
 .../org-gnome-sa-junk-plugin.eplug.xml             |   24 -
 34 files changed, 6590 insertions(+), 5794 deletions(-)

commit 2b342a4d9c020270da929a900b55105fc83bd57b
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:   Wed Jul 13 15:49:25 2011 +0200

    Add more categories to settings desktop file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654525

 data/evolution-settings.desktop.in.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1f002e02aaa2bcd0f8128937940b025cf13b0828
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date:   Tue Jul 12 23:28:14 2011 +0200

    Fix OpenBSD/FreeBSD support
    
    Move the "$host" down when $host is actually set (that is after
    AC_CANONICAL_HOST).
    Don't set DL_LIB to libdl which is not available on OpenBSD/FreeBSD and
    set NO_UNDEFINED to null.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=654478

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

commit d644993ab26f5b7c0c51c1d96e958ed4d7ebb1f4
Author: Shushi Kurose <md81bird@hitaki.net>
Date:   Tue Jul 12 23:30:26 2011 +0900

    Updated Japanese translation.

 po/ja.po | 8229 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 4181 insertions(+), 4048 deletions(-)

commit e16b79554d3c3d87bc16976255d4dfe2f818747e
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   Tue Jul 12 15:50:38 2011 +0300

    Updated Latvian translation.

 po/lv.po | 8506 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 4325 insertions(+), 4181 deletions(-)

commit 2cf6f85d7ba0eee258134a253cb55c0079b9fefc
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Jul 12 13:17:18 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  313 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 152 insertions(+), 161 deletions(-)

commit f59c38b8b60948682e0e0921f1eff6d12be1ac0f
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Tue Jul 12 12:54:55 2011 +0200

    Fix Hungarian translation of displayed time units in the calendar prefs

 po/hu.po |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit d24bf99f46989bba098e3f4a19c3d0c7f706bb8a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 10 19:05:41 2011 -0400

    Bug 652634 - Runtime warning on second search dialog
    
    A signal handler connected to an EFilterRule was passing a GtkDialog
    instance as the closure.  Eventually, the GtkDialog is destroyed but
    we never disconnected the signal handler.

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

commit 1d3590c84655100637ab2d102d560e08a6e75f98
Author: Fran Dieguez <fran@openhost.es>
Date:   Mon Jul 11 00:17:51 2011 +0200

    Updated Galician translations

 po/gl.po |  295 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 160 insertions(+), 135 deletions(-)

commit 8d7534b4a0cd8331ee52b235ae4a670e1e5b10b9
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 10 13:35:34 2011 -0400

    Bug 653568 - Forward as Redirect doesn't work
    
    X-Evolution-Account and X-Evolution-Transport headers were not getting
    set in redirected messages.

 composer/e-msg-composer.c |   53 ++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 29 deletions(-)

commit ae834b3a2ff4101b657a2dccae0d6c20a35eac28
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 10 13:28:43 2011 -0400

    EMsgComposer: Minor cleanups.

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

commit 830102ae9fef49bf5f97bae503b069d7731be712
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 10 12:18:15 2011 -0400

    Bug 652629 - GnomeCanvas: Disregard synthesized crossing events
    
    synth_crossing() in gtkwidget.c does not set valid pointer coordinates,
    but GnomeCanvas relies on these coordinates to figure out what canvas
    item the event applies to.
    
    Detect these synthesized GDK_ENTER_NOTIFY and GDK_LEAVE_NOTIFY events
    and disregard them.
    
    This was breaking drag-and-drop of EMinicards and probably elsewhere.

 libgnomecanvas/gnome-canvas.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 4bae40b6d675e0dcb11d55454de64ec393e6ee1a
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sun Jul 10 15:40:31 2011 +0200

    Updated Spanish translation

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

commit 030ca8960e0d0988a506001cb4634bcc42de7070
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sun Jul 10 14:07:05 2011 +0200

    Updated POTFILES.in

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

commit c1d697b5c18d152a0212bcc13dcfc158f2f9ecfb
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sat Jul 9 17:33:00 2011 -0400

    Remove G_DISABLE_DEPRECATED.

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

commit e868dd4bfdeb80090c42a8188ebadbc0d75ca308
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 7 14:20:50 2011 -0400

    network-manager: Keep network availablility state accurate.
    
    We track Evolution's online state separately from network availability
    these days.  I think there was still logic here from when we set online
    state directly.  Don't lie about network availability.

 .../network-manager/evolution-network-manager.c    |   53 ++++++++++---------
 1 files changed, 28 insertions(+), 25 deletions(-)

commit 42b4f85ec5263c1715f5dfd01d0f3c289b8a9c68
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 7 13:46:13 2011 -0400

    network-manager: Recover from dropped D-Bus connections faster

 .../network-manager/evolution-network-manager.c    |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

commit 26ece7454d44593b406853da122da92c4daf53a2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 7 13:45:40 2011 -0400

    connman: Recover from dropped D-Bus connections faster.

 modules/connman/evolution-connman.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

commit b0278b2eea22e06b7f04e9614c368de1bd778672
Author: Abduxukur Abdurixit <abdurixit@gmail.com>
Date:   Thu Jul 7 16:29:23 2011 +0200

    Added UG translation

 po/ug.po | 4296 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2216 insertions(+), 2080 deletions(-)

commit 98e68374e11d29e39462b7c8c35546160516f113
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 7 08:42:29 2011 -0400

    network-manager: Miscellaneous cleanups.

 .../network-manager/evolution-network-manager.c    |   40 ++++++++++++-------
 1 files changed, 25 insertions(+), 15 deletions(-)

commit 0c1a97bf118a510591bd7c966e0193aa72f030ce
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Thu Jul 7 08:37:59 2011 -0400

    connman: Miscellaneous cleanups.

 modules/connman/evolution-connman.c |   88 ++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 38 deletions(-)

commit 8d8b1512a816dcc343382ef551d6a653debfb770
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Jul 7 07:01:14 2011 +0200

    Updated Spanish translation

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

commit 68b0c521cdb22ee756ee3fdbd709843bf63c6004
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Jul 6 22:02:24 2011 -0400

    online-accounts: Give Google calendars a color.

 modules/online-accounts/e-online-accounts-google.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit 52d27cacaf5fc469c89266c49253828b9ec80124
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Sun Jul 3 11:04:31 2011 -0400

    Bug 653699 - Improve mail notifications
    
    Remove the "Generate a D-Bus message" checkbox and just do it.
    
    Replaced "Show icon in notification area" and "Popup message together
    with the icon" checkboxes with a single "Show notification when a new
    message arrives" checkbox.
    
    Re-show an unacknowledged notification message when additional new
    messages arrive.
    
    Replaced the "Default" action label in notification messages with
    "Show $FOLDER_NAME" (e.g. "Show Inbox").

 .../apps-evolution-mail-notification.schemas.in    |   23 --
 plugins/mail-notification/mail-notification.c      |  304 ++++++++------------
 2 files changed, 124 insertions(+), 203 deletions(-)

commit 985ad2d4a4f10954329f8b8ab645e3c7d2ceea0a
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Wed Jul 6 19:46:14 2011 -0400

    EShellContent: Fix underallocation of EAlertBar.
    
    Keeps GTK+ from going crazy with runtime warnings.

 shell/e-shell-content.c |   81 +++++++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 27 deletions(-)

commit 005a26de4534cfaf534e8e4828366b619a3b21d1
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 5 14:02:01 2011 -0400

    Avoid camel_stream_printf().
    
    camel_stream_printf() is next on the chopping block.
    
    Use g_strdup_printf() or a GString to construct a formatted string in
    memory, pass it to camel_stream_write() in one go, and then check for
    errors (unless it's a memory stream).

 em-format/em-format-quote.c             |   50 +++--
 mail/em-composer-utils.c                |   25 ++-
 mail/em-format-html-display.c           |  185 ++++++++++++------
 mail/em-format-html.c                   |  323 +++++++++++++++++++++++--------
 plugins/audio-inline/audio-inline.c     |   20 ++-
 plugins/image-inline/image-inline.c     |    6 +-
 plugins/itip-formatter/itip-formatter.c |   11 +-
 plugins/vcard-inline/vcard-inline.c     |    6 +-
 8 files changed, 441 insertions(+), 185 deletions(-)

commit 17127fbee9fd1b0baecb4e305c005d6abbf8d880
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 5 08:16:13 2011 -0400

    Prefer g_seekable_seek() over camel_stream_reset().
    
    When a stream is obviously a file or memory stream (both of which
    implement the GSeekable interface), use g_seekable_seek() instead of
    camel_stream_reset().
    
    This is helping me discover if it's safe to remove camel_stream_reset().
    We want to eventually move to GIO streams, which have no reset method.

 em-format/em-format-quote.c              |    8 +++++++-
 em-format/em-format.c                    |    3 ++-
 em-format/em-inline-filter.c             |    2 +-
 mail/e-mail-folder-utils.c               |   22 +++++++++++++---------
 mail/em-composer-utils.c                 |    1 -
 modules/mail/e-mail-attachment-handler.c |    2 +-
 modules/plugin-mono/Camel.cs             |    6 ------
 7 files changed, 24 insertions(+), 20 deletions(-)

commit a51ea9b9770660531d1d48da4c230e0af118f297
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Tue Jul 5 09:12:41 2011 -0400

    EMFormatQuote cleanups.
    
    Move public members to the private struct.

 em-format/em-format-quote.c |   77 ++++++++++++++++++++++++++++++-------------
 em-format/em-format-quote.h |    6 ---
 2 files changed, 54 insertions(+), 29 deletions(-)

commit 362d9c7bbb0b0e2fc641b80e8ee0ab6006f12588
Author: Fran Dieguez <fran@openhost.es>
Date:   Mon Jul 4 21:02:32 2011 +0200

    Updated Galician translations

 po/gl.po | 1302 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 675 insertions(+), 627 deletions(-)

commit 99d492b8284fa467f2b8ad3e6b637e10258d1cc2
Author: Matthew Barnes <mbarnes@redhat.com>
Date:   Mon Jul 4 09:55:30 2011 -0400

    Adapt to CamelSession and e-passwords changes.

 calendar/gui/alarm-notify/alarm-notify.c     |    6 +-----
 calendar/gui/e-meeting-store.c               |    4 ++--
 capplet/settings/mail-account-view.c         |   10 +++++-----
 mail/e-mail-session.c                        |   14 ++++----------
 mail/em-account-editor.c                     |    7 +------
 plugins/caldav/caldav-browse-server.c        |    4 ++--
 plugins/google-account-setup/google-source.c |    2 +-
 plugins/publish-calendar/publish-calendar.c  |    4 ++--
 plugins/publish-calendar/publish-location.c  |    6 +++---
 plugins/publish-calendar/url-editor-dialog.c |    6 +++---
 smime/gui/component.c                        |    4 ++--
 smime/lib/e-pkcs12.c                         |    2 +-
 12 files changed, 27 insertions(+), 42 deletions(-)

commit 56e3e6818693118b1a33c682ff71ec7d561c46d1
Author: Tommi Vainikainen <thv@iki.fi>
Date:   Mon Jul 4 15:13:13 2011 +0300

    Fixed typo in Finnish translation (bug 653929)

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

commit b1ff4355c561b8c212aa1e0f323dfedb17c486cd
Author: Chenthill Palanisamy <pchenthill@novell.com>
Date:   Mon Jul 4 14:58:52 2011 +0530

    post release version bump

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