diff -Nru evolution-3.12.10/configure evolution-3.12.11/configure --- evolution-3.12.10/configure 2015-01-12 11:20:53.000000000 +0000 +++ evolution-3.12.11/configure 2015-02-09 08:21:52.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for evolution 3.12.10. +# Generated by GNU Autoconf 2.69 for evolution 3.12.11. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='evolution' PACKAGE_TARNAME='evolution' -PACKAGE_VERSION='3.12.10' -PACKAGE_STRING='evolution 3.12.10' +PACKAGE_VERSION='3.12.11' +PACKAGE_STRING='evolution 3.12.11' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution' PACKAGE_URL='http://wiki.gnome.org/Apps/Evolution/' @@ -1581,7 +1581,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evolution 3.12.10 to adapt to many kinds of systems. +\`configure' configures evolution 3.12.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1651,7 +1651,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution 3.12.10:";; + short | recursive ) echo "Configuration of evolution 3.12.11:";; esac cat <<\_ACEOF @@ -1889,7 +1889,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution configure 3.12.10 +evolution configure 3.12.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2258,7 +2258,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution $as_me 3.12.10, which was +It was created by evolution $as_me 3.12.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3121,7 +3121,7 @@ # Define the identity of the package. PACKAGE='evolution' - VERSION='3.12.10' + VERSION='3.12.11' cat >>confdefs.h <<_ACEOF @@ -4635,9 +4635,9 @@ -if test "$3.12.10" != "$3.12.10"; then +if test "$3.12.11" != "$3.12.11"; then -$as_echo "#define STABLE_VERSION \"3.12.10\"" >>confdefs.h +$as_echo "#define STABLE_VERSION \"3.12.11\"" >>confdefs.h fi @@ -4653,7 +4653,7 @@ EVO_MINOR_VERSION=12 -EVO_MICRO_VERSION=10 +EVO_MICRO_VERSION=11 ac_ext=c @@ -15477,24 +15477,24 @@ pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS=`$PKG_CONFIG --cflags "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10" 2>/dev/null` + pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS=`$PKG_CONFIG --cflags "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15506,24 +15506,24 @@ pkg_cv_EVOLUTION_DATA_SERVER_LIBS="$EVOLUTION_DATA_SERVER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_DATA_SERVER_LIBS=`$PKG_CONFIG --libs "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10" 2>/dev/null` + pkg_cv_EVOLUTION_DATA_SERVER_LIBS=`$PKG_CONFIG --libs "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15544,26 +15544,26 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10" 2>&1` + EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11" 2>&1` else - EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10" 2>&1` + EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_DATA_SERVER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (camel-1.2 >= 3.12.10 - libebook-1.2 >= 3.12.10 - libecal-1.2 >= 3.12.10 - libedataserver-1.2 >= 3.12.10 - libebackend-1.2 >= 3.12.10) were not met: + as_fn_error $? "Package requirements (camel-1.2 >= 3.12.11 + libebook-1.2 >= 3.12.11 + libecal-1.2 >= 3.12.11 + libedataserver-1.2 >= 3.12.11 + libebackend-1.2 >= 3.12.11) were not met: $EVOLUTION_DATA_SERVER_PKG_ERRORS @@ -20434,7 +20434,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution $as_me 3.12.10, which was +This file was extended by evolution $as_me 3.12.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20501,7 +20501,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evolution config.status 3.12.10 +evolution config.status 3.12.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru evolution-3.12.10/configure.ac evolution-3.12.11/configure.ac --- evolution-3.12.10/configure.ac 2015-01-05 13:49:49.000000000 +0000 +++ evolution-3.12.11/configure.ac 2015-01-12 11:33:47.000000000 +0000 @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [12]) -m4_define([evo_micro_version], [10]) +m4_define([evo_micro_version], [11]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], diff -Nru evolution-3.12.10/debian/changelog evolution-3.12.11/debian/changelog --- evolution-3.12.10/debian/changelog 2015-01-13 16:12:55.000000000 +0000 +++ evolution-3.12.11/debian/changelog 2015-02-26 16:27:05.000000000 +0000 @@ -1,8 +1,29 @@ -evolution (3.12.10-0ubuntu0.1~trusty1) trusty; urgency=medium +evolution (3.12.11-0ubuntu0.1~trusty1) trusty; urgency=medium * Copied from vivid - -- Rico Tzschichholz Tue, 13 Jan 2015 17:12:40 +0100 + -- Rico Tzschichholz Thu, 26 Feb 2015 17:26:41 +0100 + +evolution (3.12.11-0ubuntu2) vivid; urgency=medium + + * Oops, don't clobber the archive version. + + -- Iain Lane Mon, 23 Feb 2015 16:54:55 +0000 + +evolution (3.12.11-0ubuntu1) vivid; urgency=medium + + * New upstream release. + * Bump e-d-s deps and build-deps to ≥ 3.12.11 + * Standards-Version → 3.9.6, no changes required. + + -- Iain Lane Mon, 23 Feb 2015 16:50:50 +0000 + +evolution (3.12.10-0ubuntu2) vivid; urgency=medium + + * Switch gnome-icon-theme to adwaita-icon-theme, which is its + successor. (LP: #1414613) + + -- Iain Lane Mon, 26 Jan 2015 14:54:33 +0000 evolution (3.12.10-0ubuntu1) vivid; urgency=medium diff -Nru evolution-3.12.10/debian/control evolution-3.12.11/debian/control --- evolution-3.12.10/debian/control 2015-01-13 12:58:35.000000000 +0000 +++ evolution-3.12.11/debian/control 2015-02-26 16:29:21.000000000 +0000 @@ -11,7 +11,7 @@ Pedro Fragoso , Josselin Mouette , Laurent Bigonville -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://projects.gnome.org/evolution/ Vcs-Bzr: lp:~ubuntu-desktop/evolution/ubuntu Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/evolution/ubuntu @@ -21,17 +21,17 @@ cdbs (>= 0.4.90), dh-autoreconf, dpkg-dev (>= 1.16.1), - libcamel1.2-dev (>= 3.12.10), + libcamel1.2-dev (>= 3.12.11), libglib2.0-dev (>= 2.36), libgtk-3-dev (>= 3.8.0), libgail-3-dev (>= 3.0.2), libgdk-pixbuf2.0-dev (>= 2.24.0), - libebook1.2-dev (>= 3.12.10), - libecal1.2-dev (>= 3.12.10), - libedataserver1.2-dev (>= 3.12.10), - libebackend1.2-dev (>= 3.12.10), - libebook-contacts1.2-dev (>= 3.12.10), - evolution-data-server-dev (>= 3.12.10), + libebook1.2-dev (>= 3.12.11), + libecal1.2-dev (>= 3.12.11), + libedataserver1.2-dev (>= 3.12.11), + libebackend1.2-dev (>= 3.12.11), + libebook-contacts1.2-dev (>= 3.12.11), + evolution-data-server-dev (>= 3.12.11), evolution-data-server-dev (<< 3.13), libgtkhtml-4.0-dev (>= 4.5.2), libgtkhtml-editor-4.0-dev, @@ -39,7 +39,7 @@ libgcr-3-dev (>= 3.4), libgtkspell3-3-dev, libgnome-desktop-3-dev (>= 3.8.0), - gnome-icon-theme (>= 2.30.2.1), + gnome-icon-theme, libsoup2.4-dev (>= 2.42), libxml2-dev (>= 2.7.3), shared-mime-info (>= 0.22), @@ -80,7 +80,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-common (= ${source:Version}), - evolution-data-server (>= 3.12.10), + evolution-data-server (>= 3.12.11), evolution-data-server (<< 3.13), gnome-icon-theme (>= 2.30.2.1), dbus, diff -Nru evolution-3.12.10/e-util/e-client-cache.c evolution-3.12.11/e-util/e-client-cache.c --- evolution-3.12.10/e-util/e-client-cache.c 2014-07-29 10:25:35.000000000 +0000 +++ evolution-3.12.11/e-util/e-client-cache.c 2015-01-27 13:46:14.000000000 +0000 @@ -1047,6 +1047,28 @@ return g_object_ref (client_cache->priv->registry); } +typedef struct _GetClientSyncData { + GMutex mutex; + EAsyncClosure *closure; +} GetClientSyncData; + +static void +client_cache_get_client_sync_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + GetClientSyncData *data = user_data; + + g_return_if_fail (E_IS_CLIENT_CACHE (source_object)); + g_return_if_fail (data != NULL); + + g_mutex_lock (&data->mutex); + + e_async_closure_callback (source_object, result, data->closure); + + g_mutex_unlock (&data->mutex); +} + /** * e_client_cache_get_client_sync: * @client_cache: an #EClientCache @@ -1094,7 +1116,7 @@ GCancellable *cancellable, GError **error) { - EAsyncClosure *closure; + GetClientSyncData data; GAsyncResult *result; EClient *client; @@ -1102,18 +1124,29 @@ g_return_val_if_fail (E_IS_SOURCE (source), NULL); g_return_val_if_fail (extension_name != NULL, NULL); - closure = e_async_closure_new (); + g_mutex_init (&data.mutex); + g_mutex_lock (&data.mutex); e_client_cache_get_client ( client_cache, source, extension_name,cancellable, - e_async_closure_callback, closure); + client_cache_get_client_sync_cb, &data); + + /* This is needed, because e_async_closure_new() pushes its own thread default main context, + which was later taken into an EClient within e_client_cache_get_client(), but that's wrong, + because that main context effectively dies at the end of this function. */ + data.closure = e_async_closure_new (); + + g_mutex_unlock (&data.mutex); - result = e_async_closure_wait (closure); + result = e_async_closure_wait (data.closure); client = e_client_cache_get_client_finish ( client_cache, result, error); - e_async_closure_free (closure); + g_mutex_lock (&data.mutex); + e_async_closure_free (data.closure); + g_mutex_unlock (&data.mutex); + g_mutex_clear (&data.mutex); return client; } diff -Nru evolution-3.12.10/e-util/e-client-selector.c evolution-3.12.11/e-util/e-client-selector.c --- evolution-3.12.10/e-util/e-client-selector.c 2014-06-12 19:50:57.000000000 +0000 +++ evolution-3.12.11/e-util/e-client-selector.c 2015-01-27 13:41:26.000000000 +0000 @@ -542,25 +542,22 @@ GCancellable *cancellable, GError **error) { - EAsyncClosure *closure; - GAsyncResult *result; + EClientCache *client_cache; + const gchar *extension_name; EClient *client; g_return_val_if_fail (E_IS_CLIENT_SELECTOR (selector), NULL); g_return_val_if_fail (E_IS_SOURCE (source), NULL); - closure = e_async_closure_new (); + extension_name = e_source_selector_get_extension_name (E_SOURCE_SELECTOR (selector)); - e_client_selector_get_client ( - selector, source, cancellable, - e_async_closure_callback, closure); + client_cache = e_client_selector_ref_client_cache (selector); - result = e_async_closure_wait (closure); + client = e_client_cache_get_client_sync ( + client_cache, source, + extension_name, cancellable, error); - client = e_client_selector_get_client_finish ( - selector, result, error); - - e_async_closure_free (closure); + g_object_unref (client_cache); return client; } diff -Nru evolution-3.12.10/evolution-calendar-3.0.pc evolution-3.12.11/evolution-calendar-3.0.pc --- evolution-3.12.10/evolution-calendar-3.0.pc 2015-01-12 11:30:49.000000000 +0000 +++ evolution-3.12.11/evolution-calendar-3.0.pc 2015-02-09 08:31:52.000000000 +0000 @@ -11,7 +11,7 @@ Name: Evolution Calendar Description: Calendar utilities for Evolution -Version: 3.12.10 +Version: 3.12.11 Requires: evolution-shell-3.0 Libs: -L${privlibdir} -levolution-calendar Cflags: -I${privincludedir} diff -Nru evolution-3.12.10/evolution-mail-3.0.pc evolution-3.12.11/evolution-mail-3.0.pc --- evolution-3.12.10/evolution-mail-3.0.pc 2015-01-12 11:30:49.000000000 +0000 +++ evolution-3.12.11/evolution-mail-3.0.pc 2015-02-09 08:31:52.000000000 +0000 @@ -11,7 +11,7 @@ Name: Evolution Mail Description: Mail utilities for Evolution -Version: 3.12.10 +Version: 3.12.11 Requires: evolution-shell-3.0 camel-1.2 libemail-engine Libs: -L${privlibdir} -levolution-mail -levolution-mail-composer Cflags: -I${privincludedir} diff -Nru evolution-3.12.10/evolution-shell-3.0.pc evolution-3.12.11/evolution-shell-3.0.pc --- evolution-3.12.10/evolution-shell-3.0.pc 2015-01-12 11:30:49.000000000 +0000 +++ evolution-3.12.11/evolution-shell-3.0.pc 2015-02-09 08:31:52.000000000 +0000 @@ -17,7 +17,7 @@ Name: evolution-shell Description: libraries needed for Evolution shell components -Version: 3.12.10 +Version: 3.12.11 Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 libgtkhtml-4.0 gtkhtml-editor-4.0 Requires.private: gnome-desktop-3.0 Libs: -L${privlibdir} -levolution-shell -levolution-util -Wl,-R${privlibdir} diff -Nru evolution-3.12.10/mail/message-list.c evolution-3.12.11/mail/message-list.c --- evolution-3.12.10/mail/message-list.c 2015-01-06 14:33:26.000000000 +0000 +++ evolution-3.12.11/mail/message-list.c 2015-02-04 07:07:15.000000000 +0000 @@ -5514,6 +5514,14 @@ g_object_unref (folder); } +static gboolean +message_list_is_searching (MessageList *message_list) +{ + g_return_val_if_fail (IS_MESSAGE_LIST (message_list), FALSE); + + return message_list->search && *message_list->search; +} + static void message_list_regen_done_cb (GObject *source_object, GAsyncResult *result, @@ -5573,9 +5581,7 @@ g_free (message_list->search); message_list->search = g_strdup (regen_data->search); - searching = - (message_list->search != NULL) && - (*message_list->search != '\0'); + searching = message_list_is_searching (message_list); if (regen_data->group_by_threads) { ETableItem *table_item = e_tree_get_item (E_TREE (message_list)); @@ -5804,7 +5810,7 @@ regen_data->thread_subject = message_list_get_thread_subject (message_list); - searching = (g_strcmp0 (message_list->search, " ") != 0); + searching = message_list_is_searching (message_list); adapter = e_tree_get_table_adapter (E_TREE (message_list)); row_count = e_table_model_row_count (E_TABLE_MODEL (adapter)); diff -Nru evolution-3.12.10/NEWS evolution-3.12.11/NEWS --- evolution-3.12.10/NEWS 2015-01-12 11:18:29.000000000 +0000 +++ evolution-3.12.11/NEWS 2015-02-09 08:19:44.000000000 +0000 @@ -1,3 +1,15 @@ +Evolution 3.12.11 2015-02-09 +---------------------------- + +Bug Fixes: + Bug 743959 - Automatically collapsing threads after folder update (Milan Crha) + +Miscellaneous: + Avoid/workaround usage of an EAsyncClosure when opening an EClient (Milan Crha) + +Translations: + Michał Grzybowski (pl) + Evolution 3.12.10 2015-01-12 ---------------------------- diff -Nru evolution-3.12.10/po/pl.po evolution-3.12.11/po/pl.po --- evolution-3.12.10/po/pl.po 2014-11-04 12:57:22.000000000 +0000 +++ evolution-3.12.11/po/pl.po 2015-01-27 13:39:43.000000000 +0000 @@ -3115,7 +3115,7 @@ #: ../calendar/gui/dialogs/event-editor.c:227 msgid "Make this a recurring event" -msgstr "Oznacza jako wydarz4enie powtarzalne" +msgstr "Oznacza jako wydarzenie powtarzalne" #: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14 msgid "Send Options"