From 24d9962e88c67c54692d29e015205917f9560888 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Wed, 6 May 2015 10:38:42 -0400
Subject: [PATCH] gnome: fix compilation on gnome 3.16.1
Refs #72584
(cherry picked from commit 66c50a32fb37ca5312bc324e8423e598eb657b58)
Change-Id: I975c2423f973c1bd834a95f796bf5e8d797bc905
---
src/backends/edscontactbackend.cpp | 9 +++++++--
src/backends/edscontactbackend.h | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/backends/edscontactbackend.cpp b/src/backends/edscontactbackend.cpp
index a5990446..e4b02ddd 100644
--- a/src/backends/edscontactbackend.cpp
+++ b/src/backends/edscontactbackend.cpp
@@ -67,9 +67,14 @@ registry_cb(G_GNUC_UNUSED GObject *source, GAsyncResult *result, GCancellable *c
ESource *source = E_SOURCE(l->data);
/* try to connect to each source ansynch */
#if EDS_CHECK_VERSION(3,16,0)
- e_book_client_connect(source, WAIT_FOR_CONNECTED_SECONDS, cancellable, (GAsyncReadyCallback)client_cb, NULL);
+ e_book_client_connect(source,
+ EdsContactBackend::WAIT_FOR_CONNECTED_SECONDS,
+ cancellable,
+ (GAsyncReadyCallback)client_cb,
+ NULL);
+#else
+ e_book_client_connect(source, cancellable, (GAsyncReadyCallback)client_cb, NULL);
#endif
- e_book_client_connect(source, cancellable, (GAsyncReadyCallback)client_cb, NULL);
}
g_list_free_full(list, g_object_unref);
diff --git a/src/backends/edscontactbackend.h b/src/backends/edscontactbackend.h
index 37ac8dbb..0bc9734b 100644
--- a/src/backends/edscontactbackend.h
+++ b/src/backends/edscontactbackend.h
@@ -69,7 +69,7 @@ public:
* authentication requests. In case the backend will not connect within the
* set interval, then it is opened in an offline mode. A special value -1
* can be used to not wait for the connected state at all.
- * */
+ */
constexpr static guint32 WAIT_FOR_CONNECTED_SECONDS {5};
#endif
--
GitLab