[evolution-data-server] Deprecate e_book_backend_respond_opened().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Deprecate e_book_backend_respond_opened().
- Date: Tue, 29 Jan 2013 21:47:10 +0000 (UTC)
commit 8331f94f47e0498f140ba0fdd5fc310962bf326c
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Jan 29 16:21:04 2013 -0500
Deprecate e_book_backend_respond_opened().
Use e_data_book_respond_open() instead.
.../backends/google/e-book-backend-google.c | 4 +---
addressbook/backends/ldap/e-book-backend-ldap.c | 4 ++--
.../backends/webdav/e-book-backend-webdav.c | 6 +++---
addressbook/libedata-book/e-book-backend.c | 4 +++-
addressbook/libedata-book/e-book-backend.h | 9 ++++-----
.../libedata-book/libedata-book-sections.txt | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index 79c683c..c9b2a29 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -1899,10 +1899,8 @@ e_book_backend_google_open (EBookBackend *backend,
__debug__ (G_STRFUNC);
- if (priv->cancellables && backend_is_authorized (backend)) {
- e_book_backend_respond_opened (backend, book, opid, NULL);
+ if (priv->cancellables && backend_is_authorized (backend))
return;
- }
/* Set up our object */
if (!priv->cancellables) {
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 71694aa..1392e1c 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -5268,7 +5268,7 @@ e_book_backend_ldap_open (EBookBackend *backend,
if (!bl->priv->marked_for_offline)
error = EDB_ERROR (OFFLINE_UNAVAILABLE);
- e_book_backend_respond_opened (backend, book, opid, error);
+ e_data_book_respond_open (book, opid, error);
return;
}
@@ -5300,7 +5300,7 @@ e_book_backend_ldap_open (EBookBackend *backend,
if (error == NULL && bl->priv->marked_for_offline)
generate_cache (bl);
- e_book_backend_respond_opened (backend, book, opid, error);
+ e_data_book_respond_open (book, opid, error);
}
static void
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index 69bcea8..08d2226 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -1388,7 +1388,7 @@ e_book_backend_webdav_open (EBookBackend *backend,
e_source_offline_get_stay_synchronized (offline_extension);
if (!e_backend_get_online (E_BACKEND (backend)) && !priv->marked_for_offline ) {
- e_book_backend_respond_opened (backend, book, opid, EDB_ERROR (OFFLINE_UNAVAILABLE));
+ e_data_book_respond_open (book, opid, EDB_ERROR (OFFLINE_UNAVAILABLE));
return;
}
@@ -1399,7 +1399,7 @@ e_book_backend_webdav_open (EBookBackend *backend,
g_free (priv->uri);
priv->uri = NULL;
soup_uri_free (suri);
- e_book_backend_respond_opened (backend, book, opid, EDB_ERROR_EX (OTHER_ERROR, _("Cannot transform SoupURI to string")));
+ e_data_book_respond_open (book, opid, EDB_ERROR_EX (OTHER_ERROR, _("Cannot transform SoupURI to string")));
return;
}
@@ -1454,7 +1454,7 @@ e_book_backend_webdav_open (EBookBackend *backend,
soup_uri_free (suri);
/* This function frees the GError passed to it. */
- e_book_backend_respond_opened (backend, book, opid, error);
+ e_data_book_respond_open (book, opid, error);
}
static void
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index cc85f2f..e03b1a5 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -508,7 +508,7 @@ e_book_backend_open (EBookBackend *backend,
e_data_book_report_online (book, online);
e_data_book_report_readonly (book, !writable);
- e_book_backend_respond_opened (backend, book, opid, NULL);
+ e_data_book_respond_open (book, opid, NULL);
} else {
g_mutex_unlock (&backend->priv->clients_mutex);
@@ -1386,6 +1386,8 @@ e_book_backend_notify_property_changed (EBookBackend *backend,
* See e_book_backend_open() for more details how the opening phase works.
*
* Since: 3.2
+ *
+ * Deprecated: 3.8: Use e_data_book_respond_open() instead.
**/
void
e_book_backend_respond_opened (EBookBackend *backend,
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index 6d3f095..890e0a6 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -300,11 +300,6 @@ void e_book_backend_sync (EBookBackend *backend);
void e_book_backend_set_is_removed (EBookBackend *backend,
gboolean is_removed);
-void e_book_backend_respond_opened (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GError *error);
-
#ifndef EDS_DISABLE_DEPRECATED
/**
* CLIENT_BACKEND_PROPERTY_OPENED:
@@ -353,6 +348,10 @@ void e_book_backend_foreach_view (EBookBackend *backend,
gpointer user_data);
void e_book_backend_notify_opened (EBookBackend *backend,
GError *error);
+void e_book_backend_respond_opened (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GError *error);
#endif /* EDS_DISABLE_DEPRECATED */
G_END_DECLS
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index e6c9fc0..b4030df 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -42,7 +42,6 @@ e_book_backend_notify_online
e_book_backend_notify_property_changed
e_book_backend_sync
e_book_backend_set_is_removed
-e_book_backend_respond_opened
<SUBSECTION Deprecated>
CLIENT_BACKEND_PROPERTY_OPENED
CLIENT_BACKEND_PROPERTY_OPENING
@@ -51,6 +50,7 @@ e_book_backend_is_opening
e_book_backend_set_backend_property
e_book_backend_foreach_view
e_book_backend_notify_opened
+e_book_backend_respond_opened
<SUBSECTION Standard>
E_BOOK_BACKEND
E_IS_BOOK_BACKEND
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]