aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:15:53 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:15:53 +0800
commitcec497dca69cca66c3d1a69498dd6f6e1265d673 (patch)
treeea12410f4f8b1bd1816f90851a6c33aee821d8d2
parent500751eb56f36006b7bf02cd4a2da8b2ff3dc2a4 (diff)
downloadgsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar.gz
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar.bz2
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar.lz
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar.xz
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.tar.zst
gsoc2013-empathy-cec497dca69cca66c3d1a69498dd6f6e1265d673.zip
Ignore approval that happen after the operation was approved
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2196
-rw-r--r--libempathy/empathy-dispatch-operation.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index 5619badaa..a6fb3b3a5 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -475,12 +475,18 @@ empathy_dispatch_operation_approve (EmpathyDispatchOperation *operation)
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 */