From fdbcea5e39c345635dfa9fdfd22291e8e2fadc2e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 26 Jan 2013 08:56:21 -0500 Subject: [PATCH] EClient: Deprecate e_client_set_backend_property_sync(). Clients cannot set backend properties. Any attempt will fail with an E_CLIENT_ERROR_NOT_SUPPORTED error. Also deprecate the asynchronous variant: e_client_set_backend_property() e_client_set_backend_property_finish() --- .../libedataserver/libedataserver-sections.txt | 6 ++-- libedataserver/e-client.c | 9 ++++++ libedataserver/e-client.h | 34 +++++++++++----------- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt index 42bb091..52013b5 100644 --- a/docs/reference/libedataserver/libedataserver-sections.txt +++ b/docs/reference/libedataserver/libedataserver-sections.txt @@ -59,9 +59,6 @@ e_client_cancel_all e_client_get_backend_property e_client_get_backend_property_finish e_client_get_backend_property_sync -e_client_set_backend_property -e_client_set_backend_property_finish -e_client_set_backend_property_sync e_client_open e_client_open_finish e_client_open_sync @@ -81,6 +78,9 @@ e_client_is_opened e_client_remove e_client_remove_finish e_client_remove_sync +e_client_set_backend_property +e_client_set_backend_property_finish +e_client_set_backend_property_sync e_client_util_slist_to_strv e_client_util_strv_to_slist e_client_util_copy_string_slist diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c index d87c96f..42e9a21 100644 --- a/libedataserver/e-client.c +++ b/libedataserver/e-client.c @@ -1554,6 +1554,9 @@ e_client_get_backend_property_sync (EClient *client, * by e_client_set_backend_property_finish() from the @callback. * * Since: 3.2 + * + * Deprecated: 3.8: Clients cannot set backend properties. Any attempt + * will fail with an %E_CLIENT_ERROR_NOT_SUPPORTED error. **/ void e_client_set_backend_property (EClient *client, @@ -1588,6 +1591,9 @@ e_client_set_backend_property (EClient *client, * Returns: %TRUE if successful, %FALSE otherwise. * * Since: 3.2 + * + * Deprecated: 3.8: Clients cannot set backend properties. Any attempt + * will fail with an %E_CLIENT_ERROR_NOT_SUPPORTED error. **/ gboolean e_client_set_backend_property_finish (EClient *client, @@ -1625,6 +1631,9 @@ e_client_set_backend_property_finish (EClient *client, * Returns: %TRUE if successful, %FALSE otherwise. * * Since: 3.2 + * + * Deprecated: 3.8: Clients cannot set backend properties. Any attempt + * will fail with an %E_CLIENT_ERROR_NOT_SUPPORTED error. **/ gboolean e_client_set_backend_property_sync (EClient *client, diff --git a/libedataserver/e-client.h b/libedataserver/e-client.h index 59c5427..9cee6b6 100644 --- a/libedataserver/e-client.h +++ b/libedataserver/e-client.h @@ -214,6 +214,7 @@ struct _EClientClass { GCancellable *cancellable, GError **error); + /* This method is deprecated. */ void (*set_backend_property) (EClient *client, const gchar *prop_name, const gchar *prop_value, @@ -310,23 +311,6 @@ gboolean e_client_get_backend_property_sync GCancellable *cancellable, GError **error); -void e_client_set_backend_property (EClient *client, - const gchar *prop_name, - const gchar *prop_value, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean e_client_set_backend_property_finish - (EClient *client, - GAsyncResult *result, - GError **error); -gboolean e_client_set_backend_property_sync - (EClient *client, - const gchar *prop_name, - const gchar *prop_value, - GCancellable *cancellable, - GError **error); - void e_client_open (EClient *client, gboolean only_if_exists, GCancellable *cancellable, @@ -416,6 +400,22 @@ gboolean e_client_util_unwrap_dbus_error (GError *dbus_error, #define CLIENT_BACKEND_PROPERTY_OPENING "opening" gboolean e_client_is_opened (EClient *client); +void e_client_set_backend_property (EClient *client, + const gchar *prop_name, + const gchar *prop_value, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean e_client_set_backend_property_finish + (EClient *client, + GAsyncResult *result, + GError **error); +gboolean e_client_set_backend_property_sync + (EClient *client, + const gchar *prop_name, + const gchar *prop_value, + GCancellable *cancellable, + GError **error); void e_client_remove (EClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, -- 2.7.4