[evolution-data-server] EDataBook: Remove unused "handle-cancel-operation" signal handler.



commit fd737f9cdf51c60a70f5f28a1652196bf8e45e71
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jan 29 08:51:50 2013 -0500

    EDataBook: Remove unused "handle-cancel-operation" signal handler.
    
    EBookClient never invokes this method, nor does it make sense to.

 addressbook/libedata-book/e-data-book.c |   37 -------------------------------
 1 files changed, 0 insertions(+), 37 deletions(-)
---
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 1ee0283..149f16e 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -75,7 +75,6 @@ typedef enum {
 	OP_MODIFY_CONTACTS,
 	OP_GET_BACKEND_PROPERTY,
 	OP_GET_VIEW,
-	OP_CANCEL_OPERATION,
 	OP_CANCEL_ALL,
 	OP_CLOSE
 } OperationID;
@@ -104,8 +103,6 @@ typedef struct {
 		/* OP_GET_CONTACTS */
 		/* OP_GET_CONTACTS_UIDS */
 		gchar *query;
-		/* OP_CANCEL_OPERATION */
-		guint opid;
 		/* OP_GET_BACKEND_PROPERTY */
 		gchar *prop_name;
 
@@ -389,18 +386,6 @@ operation_thread (gpointer data,
 		}
 		break;
 
-	case OP_CANCEL_OPERATION:
-		g_rec_mutex_lock (&op->book->priv->pending_ops_lock);
-
-		cancel_op = g_hash_table_lookup (
-			op->book->priv->pending_ops,
-			GUINT_TO_POINTER (op->d.opid));
-		if (cancel_op != NULL)
-			g_cancellable_cancel (cancel_op->cancellable);
-
-		g_rec_mutex_unlock (&op->book->priv->pending_ops_lock);
-		break;
-
 	case OP_CLOSE:
 		/* close just cancels all pending ops and frees data book */
 		e_book_backend_remove_client (backend, op->book);
@@ -854,25 +839,6 @@ data_book_handle_get_view_cb (EGdbusBook *interface,
 }
 
 static gboolean
-data_book_handle_cancel_operation_cb (EGdbusBook *interface,
-                                      GDBusMethodInvocation *invocation,
-                                      guint in_opid,
-                                      EDataBook *book)
-{
-	OperationData *op;
-
-	op = op_new (OP_CANCEL_OPERATION, book, invocation);
-	op->d.opid = in_opid;
-
-	e_gdbus_book_complete_cancel_operation (interface, invocation, NULL);
-
-	/* This operation is never queued. */
-	e_operation_pool_push (ops_pool, op);
-
-	return TRUE;
-}
-
-static gboolean
 data_book_handle_cancel_all_cb (EGdbusBook *interface,
                                 GDBusMethodInvocation *invocation,
                                 EDataBook *book)
@@ -1585,9 +1551,6 @@ e_data_book_init (EDataBook *ebook)
 		dbus_interface, "handle-get-view",
 		G_CALLBACK (data_book_handle_get_view_cb), ebook);
 	g_signal_connect (
-		dbus_interface, "handle-cancel-operation",
-		G_CALLBACK (data_book_handle_cancel_operation_cb), ebook);
-	g_signal_connect (
 		dbus_interface, "handle-cancel-all",
 		G_CALLBACK (data_book_handle_cancel_all_cb), ebook);
 	g_signal_connect (



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]