Accepting request 281320 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/281320
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution-ews?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2015-01-15 14:58:57 +00:00 committed by Git OBS Bridge
commit c5eb55967a
5 changed files with 14 additions and 46 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8840ff682803ab738a8bebde49bdc6dc9b91c1aa03ad4c3146f77f7701dd0206
size 663260

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2b5325edb137a6384f05ac1e57e82044f55da380ada9843a42e6fb34855ba96
size 662752

View File

@ -1,38 +0,0 @@
From 6a5a2d75a9484b482546d4ed51fa6488d7e2c95a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 12 Dec 2014 11:14:05 +0100
Subject: Bug 695754 - Reuse existing ESourceRegistry from EMailSession, if
possible
Using a new ESourceRegistry and freeing is slightly afterwards could
left some unfinished operations in the sourec registry's main_context.
A change for this lands in evolution-data-server, but better to change
also evolution-ews, to not create the source registry when not necessary.
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index ad82405..5cd46dc 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -1603,12 +1603,19 @@ static void
ews_store_maybe_update_sent_and_drafts (CamelEwsStore *ews_store,
/* const */ GSList *ews_folders)
{
+ CamelSession *session;
ESourceRegistry *registry;
ESource *sibling, *source = NULL;
g_return_if_fail (CAMEL_IS_EWS_STORE (ews_store));
- registry = e_source_registry_new_sync (NULL, NULL);
+ session = camel_service_ref_session (CAMEL_SERVICE (ews_store));
+ if (session && E_IS_MAIL_SESSION (session))
+ registry = g_object_ref (e_mail_session_get_registry (E_MAIL_SESSION (session)));
+ else
+ registry = e_source_registry_new_sync (NULL, NULL);
+ g_clear_object (&session);
+
g_return_if_fail (registry != NULL);
sibling = e_source_registry_ref_source (registry, camel_service_get_uid (CAMEL_SERVICE (ews_store)));
--
cgit v0.10.1

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jan 13 12:04:25 UTC 2015 - dimstar@opensuse.org
- Update to version 3.12.10:
+ bgo#695754: Reuse existing ESourceRegistry from EMailSession.
+ bgo#729286: [Calendar] Update stored user email after
successful connect.
- Drop evolution-ews-reuse-from-EmailSession.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 14 06:23:48 UTC 2014 - badshah400@gmail.com Sun Dec 14 06:23:48 UTC 2014 - badshah400@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package evolution-ews # spec file for package evolution-ews
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,15 +19,13 @@
Name: evolution-ews Name: evolution-ews
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.12 %define evolution_base_version 3.12
Version: 3.12.9 Version: 3.12.10
Release: 0 Release: 0
Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later
License: LGPL-2.1 License: LGPL-2.1
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
Url: http://projects.gnome.org/evolution/ Url: http://projects.gnome.org/evolution/
Source: http://download.gnome.org/sources/evolution-ews/3.12/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/evolution-ews/3.12/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM evolution-ews-reuse-from-EmailSession.patch bgo#695754 badshah400@gmail.com -- Reuse existing ESourceRegistry from EMailSession, if possible; patch taken from upstream git
Patch0: evolution-ews-reuse-from-EmailSession.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool BuildRequires: intltool
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
@ -87,7 +85,6 @@ later).
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
translation-update-upstream translation-update-upstream
%build %build