EDataCal: Remove unused "handle-cancel-operation" signal handler.
authorMatthew Barnes <mbarnes@redhat.com>
Tue, 29 Jan 2013 13:53:36 +0000 (08:53 -0500)
committerMatthew Barnes <mbarnes@redhat.com>
Tue, 29 Jan 2013 13:53:36 +0000 (08:53 -0500)
ECalClient never invokes this method, nor does it make sense to.

calendar/libedata-cal/e-data-cal.c

index 08758db..e23faa9 100644 (file)
@@ -86,7 +86,6 @@ typedef enum {
        OP_GET_VIEW,
        OP_GET_TIMEZONE,
        OP_ADD_TIMEZONE,
-       OP_CANCEL_OPERATION,
        OP_CANCEL_ALL,
        OP_CLOSE
 } OperationID;
@@ -145,8 +144,6 @@ typedef struct {
                gchar *tzid;
                /* OP_ADD_TIMEZONE */
                gchar *tzobject;
-               /* OP_CANCEL_OPERATION */
-               guint opid;
                /* OP_GET_BACKEND_PROPERTY */
                gchar *prop_name;
 
@@ -501,18 +498,6 @@ operation_thread (gpointer data,
                        op->cancellable, op->d.tzobject);
                break;
 
-       case OP_CANCEL_OPERATION:
-               g_rec_mutex_lock (&op->cal->priv->pending_ops_lock);
-
-               cancel_op = g_hash_table_lookup (
-                       op->cal->priv->pending_ops,
-                       GUINT_TO_POINTER (op->d.opid));
-               if (cancel_op != NULL)
-                       g_cancellable_cancel (cancel_op->cancellable);
-
-               g_rec_mutex_unlock (&op->cal->priv->pending_ops_lock);
-               break;
-
        case OP_CLOSE:
                /* close just cancels all pending ops and frees data cal */
                e_cal_backend_remove_client (backend, op->cal);
@@ -979,25 +964,6 @@ data_cal_handle_add_timezone_cb (EGdbusCal *interface,
 }
 
 static gboolean
-data_cal_handle_cancel_operation_cb (EGdbusCal *interface,
-                                     GDBusMethodInvocation *invocation,
-                                     guint in_opid,
-                                     EDataCal *cal)
-{
-       OperationData *op;
-
-       op = op_new (OP_CANCEL_OPERATION, cal, invocation);
-       op->d.opid = in_opid;
-
-       e_gdbus_cal_complete_cancel_operation (interface, invocation, NULL);
-
-       /* This operation is never queued. */
-       e_operation_pool_push (ops_pool, op);
-
-       return TRUE;
-}
-
-static gboolean
 data_cal_handle_cancel_all_cb (EGdbusCal *interface,
                                GDBusMethodInvocation *invocation,
                                EDataCal *cal)
@@ -2020,9 +1986,6 @@ e_data_cal_init (EDataCal *ecal)
                dbus_interface, "handle-add-timezone",
                G_CALLBACK (data_cal_handle_add_timezone_cb), ecal);
        g_signal_connect (
-               dbus_interface, "handle-cancel-operation",
-               G_CALLBACK (data_cal_handle_cancel_operation_cb), ecal);
-       g_signal_connect (
                dbus_interface, "handle-cancel-all",
                G_CALLBACK (data_cal_handle_cancel_all_cb), ecal);
        g_signal_connect (