Deprecate e_client_cancel_all().

This function no longer does anything.

diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index da5f690..3d5bcda 100644 (file)
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -638,8 +638,6 @@ book_client_dispose (GObject *object)
 
        priv = E_BOOK_CLIENT_GET_PRIVATE (object);
 
-       e_client_cancel_all (E_CLIENT (object));
-
        if (priv->dbus_proxy_error_handler_id > 0) {
                g_signal_handler_disconnect (
                        priv->dbus_proxy,

diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index cf47f8a..b81c702 100644 (file)
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -830,8 +830,6 @@ cal_client_dispose (GObject *object)
 
        priv = E_CAL_CLIENT_GET_PRIVATE (object);
 
-       e_client_cancel_all (E_CLIENT (object));
-
        if (priv->dbus_proxy_error_handler_id > 0) {
                g_signal_handler_disconnect (
                        priv->dbus_proxy,

diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt
index c9b8a46..279d9e3 100644 (file)
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -55,7 +55,6 @@ e_client_check_refresh_supported
 e_client_is_readonly
 e_client_is_online
 e_client_unwrap_dbus_error
-e_client_cancel_all
 e_client_get_backend_property
 e_client_get_backend_property_finish
 e_client_get_backend_property_sync
@@ -69,6 +68,7 @@ e_client_util_unwrap_dbus_error
 CLIENT_BACKEND_PROPERTY_OPENED
 CLIENT_BACKEND_PROPERTY_OPENING
 e_client_is_opened
+e_client_cancel_all
 e_client_retrieve_capabilities
 e_client_retrieve_capabilities_finish
 e_client_retrieve_capabilities_sync

diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index f7d13bb..fa54b02 100644 (file)
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -210,19 +210,6 @@ e_client_init (EClient *client)
 }
 
 static void
-client_dispose (GObject *object)
-{
-       EClient *client;
-
-       client = E_CLIENT (object);
-
-       e_client_cancel_all (client);
-
-       /* Chain up to parent's dispose() method. */
-       G_OBJECT_CLASS (e_client_parent_class)->dispose (object);
-}
-
-static void
 client_finalize (GObject *object)
 {
        EClient *client;
@@ -750,7 +737,6 @@ e_client_class_init (EClientClass *class)
        object_class = G_OBJECT_CLASS (class);
        object_class->set_property = client_set_property;
        object_class->get_property = client_get_property;
-       object_class->dispose = client_dispose;
        object_class->finalize = client_finalize;
 
        class->retrieve_capabilities = client_retrieve_capabilities;
@@ -1127,6 +1113,8 @@ e_client_is_opened (EClient *client)
  * Cancels all pending operations started on @client.
  *
  * Since: 3.2
+ *
+ * Deprecated: 3.8: The function no longer does anything.
  **/
 void
 e_client_cancel_all (EClient *client)

diff --git a/libedataserver/e-client.h b/libedataserver/e-client.h
index 7fd016f..4e64226 100644 (file)
--- a/libedataserver/e-client.h
+++ b/libedataserver/e-client.h
@@ -294,8 +294,6 @@ void                e_client_unwrap_dbus_error      (EClient *client,
                                                 GError *dbus_error,
                                                 GError **out_error);
 
-void           e_client_cancel_all             (EClient *client);
-
 void           e_client_get_backend_property   (EClient *client,
                                                 const gchar *prop_name,
                                                 GCancellable *cancellable,
@@ -374,6 +372,7 @@ 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_cancel_all             (EClient *client);
 void           e_client_retrieve_capabilities  (EClient *client,
                                                 GCancellable *cancellable,
                                                 GAsyncReadyCallback callback,