[evolution-data-server] libedata-book: Remove all deprecated backend APIs.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] libedata-book: Remove all deprecated backend APIs.
- Date: Fri, 22 Mar 2013 12:22:18 +0000 (UTC)
commit 4bec6568219e5779c3a2db3fc9952bb643b95485
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Mar 21 12:33:57 2013 -0400
libedata-book: Remove all deprecated backend APIs.
Clean the slate for the next round of changes.
All known 3rd party backends have been accounted for (ews/mapi/kolab),
so this should cause no disruption.
addressbook/libedata-book/e-book-backend-sync.c | 36 ---
addressbook/libedata-book/e-book-backend-sync.h | 10 -
addressbook/libedata-book/e-book-backend.c | 224 --------------------
addressbook/libedata-book/e-book-backend.h | 62 ------
addressbook/libedata-book/e-data-book.c | 115 ----------
addressbook/libedata-book/e-data-book.h | 15 --
configure.ac | 2 +-
.../libedata-book/libedata-book-sections.txt | 21 --
8 files changed, 1 insertions(+), 484 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sync.c b/addressbook/libedata-book/e-book-backend-sync.c
index 7054ea2..dd1ace6 100644
--- a/addressbook/libedata-book/e-book-backend-sync.c
+++ b/addressbook/libedata-book/e-book-backend-sync.c
@@ -146,42 +146,6 @@ e_book_backend_sync_get_backend_property (EBookBackendSync *backend,
}
/**
- * e_book_backend_sync_set_backend_property:
- * @backend: an #EBookBackendSync
- * @book: an #EDataBook
- * @cancellable: a #GCancellable for the operation
- * @prop_name: Property name to set.
- * @prop_value: New value of the @prop_name.
- * @error: #GError to set, when something fails
- *
- * Calls the set_backend_property_sync method on the given backend.
- *
- * Returns whether processed this property. Returning FALSE means to pass
- * the call to the EBookBackend parent class, thus neither @error should be
- * set in this case.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: This function always returns %FALSE and sets an
- * %E_DATA_BOOK_STATUS_NOT_SUPPORTED error.
- **/
-gboolean
-e_book_backend_sync_set_backend_property (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *prop_name,
- const gchar *prop_value,
- GError **error)
-{
- g_set_error_literal (
- error, E_DATA_BOOK_ERROR,
- E_DATA_BOOK_STATUS_NOT_SUPPORTED,
- _("Clients cannot set backend properties"));
-
- return FALSE;
-}
-
-/**
* e_book_backend_sync_remove_contacts:
* @backend: an #EBookBackendSync
* @book: an #EDataBook
diff --git a/addressbook/libedata-book/e-book-backend-sync.h b/addressbook/libedata-book/e-book-backend-sync.h
index 566566d..3a604be 100644
--- a/addressbook/libedata-book/e-book-backend-sync.h
+++ b/addressbook/libedata-book/e-book-backend-sync.h
@@ -173,16 +173,6 @@ void e_book_backend_sync_get_contact_list_uids
GSList **contacts_uids,
GError **error);
-#ifndef EDS_DISABLE_DEPRECATED
-gboolean e_book_backend_sync_set_backend_property
- (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *prop_name,
- const gchar *prop_value,
- GError **error);
-#endif /* EDS_DISABLE_DEPRECATED */
-
G_END_DECLS
#endif /* E_BOOK_BACKEND_SYNC_H */
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index c6964fe..1a192f1 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -913,39 +913,6 @@ e_book_backend_remove_view (EBookBackend *backend,
}
/**
- * e_book_backend_add_client:
- * @backend: An addressbook backend.
- * @book: the corba object representing the client connection.
- *
- * Adds a client to an addressbook backend.
- *
- * Returns: TRUE on success, FALSE on failure to add the client.
- *
- * Deprecated: 3.10: This function no longer does anything.
- */
-gboolean
-e_book_backend_add_client (EBookBackend *backend,
- EDataBook *book)
-{
- return TRUE;
-}
-
-/**
- * e_book_backend_remove_client:
- * @backend: an #EBookBackend
- * @book: an #EDataBook to remove
- *
- * Removes @book from the list of @backend's clients.
- *
- * Deprecated: 3.10: This function no longer does anything.
- **/
-void
-e_book_backend_remove_client (EBookBackend *backend,
- EDataBook *book)
-{
-}
-
-/**
* e_book_backend_list_views:
* @backend: an #EBookBackend
*
@@ -985,40 +952,6 @@ e_book_backend_list_views (EBookBackend *backend)
}
/**
- * e_book_backend_foreach_view:
- * @backend: an #EBookBackend
- * @callback: callback to call
- * @user_data: user_data passed into the @callback
- *
- * Calls @callback for each known book view of this @backend.
- * @callback returns %FALSE to stop further processing.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_book_backend_list_views() instead.
- **/
-void
-e_book_backend_foreach_view (EBookBackend *backend,
- gboolean (*callback) (EDataBookView *view,
- gpointer user_data),
- gpointer user_data)
-{
- GList *list, *link;
-
- g_return_if_fail (E_IS_BOOK_BACKEND (backend));
- g_return_if_fail (callback != NULL);
-
- list = e_book_backend_list_views (backend);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- if (!callback (E_DATA_BOOK_VIEW (link->data), user_data))
- break;
- }
-
- g_list_free_full (list, (GDestroyNotify) g_object_unref);
-}
-
-/**
* e_book_backend_get_book_backend_property:
* @backend: an #EBookBackend
* @book: an #EDataBook
@@ -1049,36 +982,6 @@ e_book_backend_get_backend_property (EBookBackend *backend,
}
/**
- * e_book_backend_set_backend_property:
- * @backend: an #EBookBackend
- * @book: an #EDataBook
- * @opid: the ID to use for this operation
- * @cancellable: a #GCancellable for the operation
- * @prop_name: property name to change; cannot be NULL
- * @prop_value: value to set to @prop_name; cannot be NULL
- *
- * Calls the set_backend_property method on the given backend.
- * This might be finished with e_data_book_respond_set_backend_property().
- * Default implementation simply returns an 'unsupported' error.
- * The subclass may always call this default implementation for properties
- * which fetching it doesn't overwrite.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: This function no longer does anything.
- **/
-void
-e_book_backend_set_backend_property (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *prop_name,
- const gchar *prop_value)
-{
- /* Do nothing. */
-}
-
-/**
* e_book_backend_is_opened:
* @backend: an #EBookBackend
*
@@ -1110,32 +1013,6 @@ e_book_backend_is_opened (EBookBackend *backend)
}
/**
- * e_book_backend_is_opening:
- * @backend: an #EBookBackend
- *
- * Checks if @backend is processing its opening phase, which
- * includes everything since the e_book_backend_open() call,
- * through authentication, up to e_book_backend_notify_opened().
- * This property is managed automatically and the backend deny
- * every operation except of cancel and authenticate_user while
- * it is being opening.
- *
- * Returns: %FALSE always
- *
- * Deprecated: 3.8: This function is no longer relevant,
- * and always returns %FALSE.
- *
- * Since: 3.2
- **/
-gboolean
-e_book_backend_is_opening (EBookBackend *backend)
-{
- g_return_val_if_fail (E_IS_BOOK_BACKEND (backend), FALSE);
-
- return FALSE;
-}
-
-/**
* e_book_backend_is_readonly:
* @backend: an #EBookBackend
*
@@ -1369,76 +1246,6 @@ e_book_backend_notify_error (EBookBackend *backend,
}
/**
- * e_book_backend_notify_readonly:
- * @backend: an #EBookBackend
- * @is_readonly: flag indicating readonly status
- *
- * Notifies all backend's clients about the current readonly state.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_book_backend_set_writable() instead.
- **/
-void
-e_book_backend_notify_readonly (EBookBackend *backend,
- gboolean is_readonly)
-{
- g_return_if_fail (E_IS_BOOK_BACKEND (backend));
-
- e_book_backend_set_writable (backend, !is_readonly);
-}
-
-/**
- * e_book_backend_notify_online:
- * @backend: an #EBookBackend
- * @is_online: flag indicating whether @backend is connected and online
- *
- * Notifies clients of @backend's connection status indicated by @is_online.
- * Meant to be used by backend implementations.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_backend_set_online() instead.
- **/
-void
-e_book_backend_notify_online (EBookBackend *backend,
- gboolean is_online)
-{
- g_return_if_fail (E_IS_BOOK_BACKEND (backend));
-
- e_backend_set_online (E_BACKEND (backend), is_online);
-}
-
-/**
- * e_book_backend_notify_opened:
- * @backend: an #EBookBackend
- * @error: a #GError corresponding to the error encountered during
- * the opening phase. Use %NULL for success. The @error is freed
- * automatically if not %NULL.
- *
- * Notifies clients that @backend finished its opening phase.
- * See e_book_backend_open() for more information how the opening
- * phase works. Calling this function changes 'opening' property,
- * same as 'opened'. 'opening' is set to %FALSE and the backend
- * is considered 'opened' only if the @error is %NULL.
- *
- * See also: e_book_backend_respond_opened()
- *
- * Note: The @error is freed automatically if not %NULL.
- *
- * Meant to be used by backend implementations.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_data_book_respond_open() instead.
- **/
-void
-e_book_backend_notify_opened (EBookBackend *backend,
- GError *error)
-{
-}
-
-/**
* e_book_backend_notify_property_changed:
* @backend: an #EBookBackend
* @prop_name: property name, which changed
@@ -1468,34 +1275,3 @@ e_book_backend_notify_property_changed (EBookBackend *backend,
}
}
-/**
- * e_book_backend_respond_opened:
- * @backend: an #EBookBackend
- * @book: an #EDataBook
- * @opid: an operation ID
- * @error: result error; can be %NULL, if it isn't then it's automatically freed
- *
- * This is a replacement for e_data_book_respond_open() for cases where
- * the finish of 'open' method call also finishes backend opening phase.
- * This function covers calling of both e_book_backend_notify_opened()
- * and e_data_book_respond_open() with the same @error.
- *
- * 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,
- EDataBook *book,
- guint32 opid,
- GError *error)
-{
- g_return_if_fail (backend != NULL);
- g_return_if_fail (E_IS_BOOK_BACKEND (backend));
- g_return_if_fail (book != NULL);
- g_return_if_fail (opid != 0);
-
- e_data_book_respond_open (book, opid, error);
-}
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index 505df28..97d308f 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -307,68 +307,6 @@ void e_book_backend_sync (EBookBackend *backend);
void e_book_backend_set_is_removed (EBookBackend *backend,
gboolean is_removed);
-#ifndef EDS_DISABLE_DEPRECATED
-/**
- * CLIENT_BACKEND_PROPERTY_OPENED:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Clients don't need to care if they're fully opened
- * anymore. This property will always return %TRUE.
- **/
-#define CLIENT_BACKEND_PROPERTY_OPENED "opened"
-
-/**
- * CLIENT_BACKEND_PROPERTY_OPENING:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Clients don't need to care if they're fully opened
- * anymore. This property will always return %FALSE.
- **/
-#define CLIENT_BACKEND_PROPERTY_OPENING "opening"
-
-/**
- * BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS:
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: The property is no longer supported.
- **/
-#define BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS "supported-auth-methods"
-
-gboolean e_book_backend_add_client (EBookBackend *backend,
- EDataBook *book);
-void e_book_backend_remove_client (EBookBackend *backend,
- EDataBook *book);
-gboolean e_book_backend_is_opening (EBookBackend *backend);
-void e_book_backend_set_backend_property
- (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *prop_name,
- const gchar *prop_value);
-void e_book_backend_foreach_view (EBookBackend *backend,
- gboolean (*callback) (EDataBookView *view,
- gpointer user_data),
- gpointer user_data);
-void e_book_backend_notify_opened (EBookBackend *backend,
- GError *error);
-void e_book_backend_notify_readonly (EBookBackend *backend,
- gboolean is_readonly);
-void e_book_backend_notify_online (EBookBackend *backend,
- gboolean is_online);
-void e_book_backend_respond_opened (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GError *error);
-#endif /* EDS_DISABLE_DEPRECATED */
-
G_END_DECLS
#endif /* E_BOOK_BACKEND_H */
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 6339a37..c302cf8 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -1329,23 +1329,6 @@ e_data_book_respond_get_backend_property (EDataBook *book,
op_unref (data);
}
-/**
- * e_data_book_respond_set_backend_property:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: This function no longer does anything.
- **/
-void
-e_data_book_respond_set_backend_property (EDataBook *book,
- guint32 opid,
- GError *error)
-{
- /* Do nothing. */
-}
-
void
e_data_book_respond_get_contact (EDataBook *book,
guint32 opid,
@@ -1740,75 +1723,6 @@ e_data_book_report_error (EDataBook *book,
}
/**
- * e_data_book_report_readonly:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_book_backend_set_writable() instead.
- **/
-void
-e_data_book_report_readonly (EDataBook *book,
- gboolean readonly)
-{
- EBookBackend *backend;
-
- g_return_if_fail (E_IS_DATA_BOOK (book));
-
- backend = e_data_book_ref_backend (book);
-
- if (backend != NULL) {
- e_book_backend_set_writable (backend, !readonly);
- g_object_unref (backend);
- }
-}
-
-/**
- * e_data_book_report_online:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: Use e_backend_set_online() instead.
- **/
-void
-e_data_book_report_online (EDataBook *book,
- gboolean is_online)
-{
- EBookBackend *backend;
-
- g_return_if_fail (E_IS_DATA_BOOK (book));
-
- backend = e_data_book_ref_backend (book);
-
- if (backend != NULL) {
- e_backend_set_online (E_BACKEND (backend), is_online);
- g_object_unref (backend);
- }
-}
-
-/**
- * e_data_book_report_opened:
- *
- * Reports to associated client that opening phase of the book is finished.
- * error being NULL means successfully, otherwise reports an error which
- * happened during opening phase. By opening phase is meant a process
- * including successfull authentication to the server/storage.
- *
- * Since: 3.2
- *
- * Deprecated: 3.8: This function no longer does anything.
- **/
-void
-e_data_book_report_opened (EDataBook *book,
- const GError *error)
-{
- /* Do nothing. */
-}
-
-/**
* e_data_book_report_backend_property_changed:
*
* FIXME: Document me.
@@ -2383,35 +2297,6 @@ e_data_book_ref_backend (EDataBook *book)
}
/**
- * e_data_book_get_backend:
- * @book: an #EDataBook
- *
- * Returns the #EBookBackend to which incoming remote method invocations
- * are being forwarded.
- *
- * Returns: the #EBookBackend
- *
- * Deprecated: 3.10: Use e_data_book_ref_backend() instead.
- **/
-EBookBackend *
-e_data_book_get_backend (EDataBook *book)
-{
- EBookBackend *backend;
-
- g_return_val_if_fail (E_IS_DATA_BOOK (book), NULL);
-
- backend = e_data_book_ref_backend (book);
-
- /* XXX Drop the EBookBackend reference for backward-compatibility.
- * This is risky. Without a reference, the EBookBackend could
- * be finalized while the caller is still using it. */
- if (backend != NULL)
- g_object_unref (backend);
-
- return backend;
-}
-
-/**
* e_data_book_get_connection:
* @book: an #EDataBook
*
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index 942ed57..836d96e 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -273,21 +273,6 @@ gboolean e_data_book_get_contacts_uids_sync
GCancellable *cancellable,
GError **error);
-#ifndef EDS_DISABLE_DEPRECATED
-struct _EBookBackend *
- e_data_book_get_backend (EDataBook *book);
-void e_data_book_respond_set_backend_property
- (EDataBook *book,
- guint32 opid,
- GError *error);
-void e_data_book_report_opened (EDataBook *book,
- const GError *error);
-void e_data_book_report_readonly (EDataBook *book,
- gboolean readonly);
-void e_data_book_report_online (EDataBook *book,
- gboolean is_online);
-#endif /* EDS_DISABLE_DEPRECATED */
-
G_END_DECLS
#endif /* E_DATA_BOOK_H */
diff --git a/configure.ac b/configure.ac
index f4b0604..6112c33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,7 @@ LIBEDATACAL_CURRENT=20
LIBEDATACAL_REVISION=0
LIBEDATACAL_AGE=0
-LIBEDATABOOK_CURRENT=17
+LIBEDATABOOK_CURRENT=18
LIBEDATABOOK_REVISION=0
LIBEDATABOOK_AGE=0
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index 0f00c80..78e8f48 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -42,19 +42,6 @@ e_book_backend_sync
e_book_backend_set_is_removed
e_book_backend_get_direct_book
e_book_backend_configure_direct
-<SUBSECTION Deprecated>
-CLIENT_BACKEND_PROPERTY_OPENED
-CLIENT_BACKEND_PROPERTY_OPENING
-BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS
-e_book_backend_add_client
-e_book_backend_remove_client
-e_book_backend_is_opening
-e_book_backend_set_backend_property
-e_book_backend_foreach_view
-e_book_backend_notify_opened
-e_book_backend_notify_readonly
-e_book_backend_notify_online
-e_book_backend_respond_opened
<SUBSECTION Standard>
E_BOOK_BACKEND
E_IS_BOOK_BACKEND
@@ -251,8 +238,6 @@ e_book_backend_sync_modify_contacts
e_book_backend_sync_get_contact
e_book_backend_sync_get_contact_list
e_book_backend_sync_get_contact_list_uids
-<SUBSECTION Deprecated>
-e_book_backend_sync_set_backend_property
<SUBSECTION Standard>
E_BOOK_BACKEND_SYNC
E_IS_BOOK_BACKEND_SYNC
@@ -307,12 +292,6 @@ e_data_book_get_contacts_sync
e_data_book_get_contacts_uids
e_data_book_get_contacts_uids_finish
e_data_book_get_contacts_uids_sync
-<SUBSECTION Deprecated>
-e_data_book_get_backend
-e_data_book_respond_set_backend_property
-e_data_book_report_opened
-e_data_book_report_readonly
-e_data_book_report_online
<SUBSECTION Standard>
E_DATA_BOOK
E_IS_DATA_BOOK
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
