remove internal approving code

1 files changed, 1 insertions, 49 deletions

diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index 78438125b..68777a50e 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -51,8 +51,6 @@ enum
 {
     /* Ready for dispatching */
     READY,
-    /* Approved by an approver, can only happens on incoming operations */
-    APPROVED,
     /* Claimed by a handler */
     CLAIMED,
     /* Error, channel went away, inspecting it failed etc */
@@ -87,7 +85,6 @@ struct _EmpathyDispatchOperationPriv
   EmpathyDispatchOperationState status;
   gboolean incoming;
   gint64 user_action_time;
-  gboolean approved;
   gulong invalidated_handler;
   gulong ready_handler;
 };
@@ -295,14 +292,6 @@ empathy_dispatch_operation_class_init (
       g_cclosure_marshal_VOID__VOID,
       G_TYPE_NONE, 0);
 
-  signals[APPROVED] = g_signal_new ("approved",
-    G_OBJECT_CLASS_TYPE(empathy_dispatch_operation_class),
-      G_SIGNAL_RUN_LAST,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE, 0);
-
   signals[CLAIMED] = g_signal_new ("claimed",
     G_OBJECT_CLASS_TYPE(empathy_dispatch_operation_class),
       G_SIGNAL_RUN_LAST,
@@ -567,47 +556,10 @@ empathy_dispatch_operation_start (EmpathyDispatchOperation *operation)
   g_return_if_fail (
     priv->status == EMPATHY_DISPATCHER_OPERATION_STATE_PENDING);
 
-  if (priv->incoming && !priv->approved)
-    empathy_dispatch_operation_set_status (operation,
-      EMPATHY_DISPATCHER_OPERATION_STATE_APPROVING);
-  else
-    empathy_dispatch_operation_set_status (operation,
+  empathy_dispatch_operation_set_status (operation,
       EMPATHY_DISPATCHER_OPERATION_STATE_DISPATCHING);
 }
 
-void
-empathy_dispatch_operation_approve (EmpathyDispatchOperation *operation)
-{
-  EmpathyDispatchOperationPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_DISPATCH_OPERATION (operation));
-
-  priv = GET_PRIV (operation);
-
-  if (priv->status == EMPATHY_DISPATCHER_OPERATION_STATE_APPROVING)
-    {
-      DEBUG ("Approving operation %s",
-        empathy_dispatch_operation_get_object_path (operation));
-
-      empathy_dispatch_operation_set_status (operation,
-        EMPATHY_DISPATCHER_OPERATION_STATE_DISPATCHING);
-
-      g_signal_emit (operation, signals[APPROVED], 0);
-    }
-  else if (priv->status < EMPATHY_DISPATCHER_OPERATION_STATE_APPROVING)
-    {
-      DEBUG ("Pre-approving operation %s",
-        empathy_dispatch_operation_get_object_path (operation));
-      priv->approved = TRUE;
-    }
-  else
-    {
-      DEBUG (
-        "Ignoring approval for %s as it's already past the approval stage",
-        empathy_dispatch_operation_get_object_path (operation));
-    }
-}
-
 /* Returns whether or not the operation was successfully claimed */
 gboolean
 empathy_dispatch_operation_claim (EmpathyDispatchOperation *operation)