Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at 2018-06-02 11:54:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution (Old) and /work/SRC/openSUSE:Factory/.evolution.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution" Sat Jun 2 11:54:52 2018 rev:212 rq:612857 version:3.28.2 Changes: -------- --- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2018-05-10 15:46:12.696275031 +0200 +++ /work/SRC/openSUSE:Factory/.evolution.new/evolution.changes 2018-06-02 11:54:59.717734570 +0200 @@ -1,0 +2,8 @@ +Wed May 16 21:47:45 UTC 2018 - bjorn....@gmail.com + +- Add evolution-autoArchive-archives-Junk-and-Deleted-too.patch: + AutoArchive archives Junk and Deleted messages too (bgo#795977). +- Add evolution-alarm-notify-do-not-use-markup.patch: alarm-notify: + Do not use markup around organizer name in libnotify text. + +------------------------------------------------------------------- New: ---- evolution-alarm-notify-do-not-use-markup.patch evolution-autoArchive-archives-Junk-and-Deleted-too.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.fBa1LE/_old 2018-06-02 11:55:00.585702733 +0200 +++ /var/tmp/diff_new_pack.fBa1LE/_new 2018-06-02 11:55:00.585702733 +0200 @@ -33,6 +33,11 @@ Group: Productivity/Networking/Email/Clients URL: http://wiki.gnome.org/Apps/Evolution/ Source0: http://download.gnome.org/sources/evolution/%{evolution_base_version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM evolution-autoArchive-archives-Junk-and-Deleted-too.patch bgo#795977 -- AutoArchive archives Junk and Deleted messages too +Patch0: evolution-autoArchive-archives-Junk-and-Deleted-too.patch +# PATCH-FIX-UPSTREAM evolution-alarm-notify-do-not-use-markup.patch -- [alarm-notify] Do not use markup around organizer name in libnotify text +Patch1: evolution-alarm-notify-do-not-use-markup.patch + # The icon we rely on is from adwaita-icon-theme BuildRequires: adwaita-icon-theme BuildRequires: bison @@ -161,7 +166,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 translation-update-upstream %build ++++++ evolution-alarm-notify-do-not-use-markup.patch ++++++ >From 7dc7f0d9574355e5ad94a842ac3769d6e2313743 Mon Sep 17 00:00:00 2001 From: Milan Crha <mc...@redhat.com> Date: Wed, 16 May 2018 11:59:51 +0200 Subject: [alarm-notify] Do not use markup around organizer name in libnotify text This markup (making the text bold) might not be always used in the notification, resulting in the markup being shown to the user instead. --- src/calendar/alarm-notify/alarm-queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calendar/alarm-notify/alarm-queue.c b/src/calendar/alarm-notify/alarm-queue.c index c248f39..e1070fa 100644 --- a/src/calendar/alarm-notify/alarm-queue.c +++ b/src/calendar/alarm-notify/alarm-queue.c @@ -1965,12 +1965,12 @@ popup_notification (time_t trigger, if (organiser.cn) { if (location) body = g_strdup_printf ( - "<b>%s</b>\n%s %s\n%s %s", + "%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); else body = g_strdup_printf ( - "<b>%s</b>\n%s %s", + "%s\n%s %s", organiser.cn, start_str, time_str); } else { -- cgit v0.12 ++++++ evolution-autoArchive-archives-Junk-and-Deleted-too.patch ++++++ >From ccc936b4971a8f9a9be7f4712a5dd23813c936cf Mon Sep 17 00:00:00 2001 From: Milan Crha <mc...@redhat.com> Date: Mon, 14 May 2018 11:51:13 +0200 Subject: Bug 795977 - AutoArchive archives Junk and Deleted messages too --- src/mail/em-utils.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mail/em-utils.c b/src/mail/em-utils.c index 0f604bd..fd39154 100644 --- a/src/mail/em-utils.c +++ b/src/mail/em-utils.c @@ -1803,12 +1803,16 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend, g_date_time_unref (now_time); - search_sexp = g_strdup_printf ("(match-all (< (get-sent-date) %" G_GINT64_FORMAT "))", g_date_time_to_unix (use_time)); + search_sexp = g_strdup_printf ("(match-all (and " + "(not (system-flag \"junk\")) " + "(not (system-flag \"deleted\")) " + "(< (get-sent-date) %" G_GINT64_FORMAT ")" + "))", g_date_time_to_unix (use_time)); uids = camel_folder_search_by_expression (folder, search_sexp, cancellable, error); if (!uids) { success = FALSE; - } else { + } else if (uids->len > 0) { gint ii; if (aa_config == E_AUTO_ARCHIVE_CONFIG_MOVE_TO_ARCHIVE || @@ -1863,9 +1867,10 @@ em_utils_process_autoarchive_sync (EMailBackend *mail_backend, camel_folder_thaw (folder); } + } + if (uids) camel_folder_search_free (folder, uids); - } g_free (search_sexp); g_free (aa_custom_target_folder_uri); -- cgit v0.12
