empathy r2196 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:15:53 2009
New Revision: 2196
URL: http://svn.gnome.org/viewvc/empathy?rev=2196&view=rev

Log:
Ignore approval that happen after the operation was approved

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy/empathy-dispatch-operation.c

Modified: trunk/libempathy/empathy-dispatch-operation.c
==============================================================================
--- trunk/libempathy/empathy-dispatch-operation.c	(original)
+++ trunk/libempathy/empathy-dispatch-operation.c	Fri Jan  9 16:15:53 2009
@@ -475,12 +475,18 @@
 
       g_signal_emit (operation, signals[APPROVED], 0);
     }
-  else
+  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 */