forked from pool/evolution
Accepting request 417753 from home:Zaitor
New stable rel OBS-URL: https://build.opensuse.org/request/show/417753 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=308
This commit is contained in:
Git OBS Bridge
parent
20b225e1fe
commit
a17337ef0f
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2c29733cb49042dca093bb4b3c4a3eb7fdc5d7437d1bd048fa39822f4d5436bc
|
||||
size 12133788
|
||||
3
evolution-3.20.5.tar.xz
Normal file
3
evolution-3.20.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e
|
||||
size 12133872
|
||||
@ -1,64 +0,0 @@
|
||||
From 7d7e1d8be792977968788f8fe252a36422370fde Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Wed, 3 Aug 2016 13:21:12 +0200
|
||||
Subject: [PATCH] Bug 768683 - Cannot mark as spam non-spam message in a real
|
||||
Junk folder
|
||||
|
||||
---
|
||||
mail/e-mail-reader.c | 12 ++----------
|
||||
1 file changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
|
||||
index b41ddab..98b9e2a 100644
|
||||
--- a/mail/e-mail-reader.c
|
||||
+++ b/mail/e-mail-reader.c
|
||||
@@ -3841,9 +3841,7 @@ mail_reader_update_actions (EMailReader *reader,
|
||||
gtk_action_set_sensitive (action, sensitive);
|
||||
|
||||
action_name = "mail-mark-junk";
|
||||
- sensitive =
|
||||
- selection_has_not_junk_messages &&
|
||||
- !(state & E_MAIL_READER_FOLDER_IS_JUNK);
|
||||
+ sensitive = selection_has_not_junk_messages;
|
||||
action = e_mail_reader_get_action (reader, action_name);
|
||||
gtk_action_set_sensitive (action, sensitive);
|
||||
|
||||
@@ -4498,7 +4496,6 @@ e_mail_reader_check_state (EMailReader *reader)
|
||||
gboolean has_mail_note = FALSE;
|
||||
gboolean have_enabled_account = FALSE;
|
||||
gboolean drafts_or_outbox = FALSE;
|
||||
- gboolean store_supports_vjunk = FALSE;
|
||||
gboolean is_mailing_list;
|
||||
gboolean is_junk_folder = FALSE;
|
||||
gboolean is_vtrash_folder = FALSE;
|
||||
@@ -4522,7 +4519,6 @@ e_mail_reader_check_state (EMailReader *reader)
|
||||
gchar *archive_folder;
|
||||
|
||||
store = camel_folder_get_parent_store (folder);
|
||||
- store_supports_vjunk = (store->flags & CAMEL_STORE_VJUNK);
|
||||
is_junk_folder =
|
||||
(folder->folder_flags & CAMEL_FOLDER_IS_JUNK) != 0;
|
||||
is_vtrash_folder = (store->flags & CAMEL_STORE_VTRASH) != 0 && (folder->folder_flags & CAMEL_FOLDER_IS_TRASH) != 0;
|
||||
@@ -4567,7 +4563,7 @@ e_mail_reader_check_state (EMailReader *reader)
|
||||
if (drafts_or_outbox) {
|
||||
has_junk = FALSE;
|
||||
has_not_junk = FALSE;
|
||||
- } else if (store_supports_vjunk) {
|
||||
+ } else {
|
||||
guint32 bitmask;
|
||||
|
||||
/* XXX Strictly speaking, this logic is correct.
|
||||
@@ -4590,10 +4586,6 @@ e_mail_reader_check_state (EMailReader *reader)
|
||||
has_junk = TRUE;
|
||||
has_not_junk = TRUE;
|
||||
}
|
||||
-
|
||||
- } else {
|
||||
- has_junk = TRUE;
|
||||
- has_not_junk = TRUE;
|
||||
}
|
||||
|
||||
if (flags & CAMEL_MESSAGE_DELETED)
|
||||
--
|
||||
2.6.6
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From b8c2ca1a59b3cd84f034c4514b9ffd8f8607aa11 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Tue, 2 Aug 2016 18:48:26 +0200
|
||||
Subject: [PATCH] Bug 769062 - Crash on mouse over task when tasks are grouped
|
||||
|
||||
---
|
||||
e-util/e-table-group-container.c | 17 ++++++++++++++---
|
||||
1 file changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c
|
||||
index 0069e43..850e018 100644
|
||||
--- a/e-util/e-table-group-container.c
|
||||
+++ b/e-util/e-table-group-container.c
|
||||
@@ -835,16 +835,27 @@ etgc_get_cell_geometry (ETableGroup *etg,
|
||||
for (list = etgc->children; list; list = list->next) {
|
||||
ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
|
||||
ETableGroup *child = child_node->child;
|
||||
- gint thisy;
|
||||
+ gint thisy = 0;
|
||||
+ gdouble group_header_y1 = 0.0, group_header_y2 = 0.0;
|
||||
|
||||
e_table_group_get_cell_geometry (child, row, col, x, &thisy, width, height);
|
||||
ypos += thisy;
|
||||
if ((*row == -1) || (*col == -1)) {
|
||||
ypos += TITLE_HEIGHT;
|
||||
- *x += GROUP_INDENT;
|
||||
- *y = ypos;
|
||||
+ if (x)
|
||||
+ *x += GROUP_INDENT;
|
||||
+ if (y)
|
||||
+ *y = ypos;
|
||||
return;
|
||||
}
|
||||
+
|
||||
+ g_object_get (
|
||||
+ child_node->rect,
|
||||
+ "y1", &group_header_y1,
|
||||
+ "y2", &group_header_y2,
|
||||
+ NULL);
|
||||
+
|
||||
+ ypos += group_header_y2 - group_header_y1;
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.6.6
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 8 09:53:33 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.20.5:
|
||||
+ EComposerPrivate: Changing a top signature to another one will
|
||||
place it on different position.
|
||||
+ EComposerPrivate: Unneeded spacer left when setting a top
|
||||
signature from an existing one to None.
|
||||
+ EHTMLEditorView: Redoing unquoting does not work.
|
||||
+ Correct order of "assign value" and "call function" when saving
|
||||
to drafts.
|
||||
+ Bugs fixed: bgo#768449, bgo#767283, bgo#769338, bgo#769354,
|
||||
bgo#769062, bgo#768683, bgo#769072, bgo#769523, bgo#769288.
|
||||
- Drop evolution-bgo769062-mouseover-crash.patch and
|
||||
evolution-bgo768683-cannot-mark-as-spam.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 3 17:36:41 UTC 2016 - mgorse@suse.com
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
Name: evolution
|
||||
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
||||
%define evolution_base_version 3.20
|
||||
Version: 3.20.4
|
||||
Version: 3.20.5
|
||||
Release: 0
|
||||
# _version needs to be %{version} stripped to major.minor.micro only...
|
||||
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
|
||||
@ -36,10 +36,6 @@ Group: Productivity/Networking/Email/Clients
|
||||
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
|
||||
Url: http://wiki.gnome.org/Apps/Evolution/
|
||||
Source0: http://download.gnome.org/sources/evolution/3.20/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM evolution-bgo769062-mouseover-crash.patch bgo#769062 mgorse@suse.com -- fix crash on mouse over task when tasks are grouped.
|
||||
Patch0: evolution-bgo769062-mouseover-crash.patch
|
||||
# PATCH-FIX-UPSTREAM evolution-bgo768683-cannot-mark-as-spam.patch bgo#768683 mgorse@suse.com -- fix for not being able to mark a non-spam message in a spam folder as spam over imap.
|
||||
Patch1: evolution-bgo768683-cannot-mark-as-spam.patch
|
||||
# The icon we rely on is from adwaita-icon-theme
|
||||
BuildRequires: adwaita-icon-theme
|
||||
BuildRequires: bison
|
||||
@ -165,8 +161,6 @@ to develop applications that require these.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%if %{need_autogen}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user