From 00384ccb472a5ae9997e9e6fa6e61321d5e54497 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 26 Sep 2011 10:51:10 +0200 Subject: [PATCH] telepathyClient: call delay on context when approving a FT or call Not doing so is considered as a bug as we don't accept the context right away. It leads to tp-glib returning directly from the AddDispatchOperation() D-Bus call and so automatically approve the channel if the Shell is the only approver running. https://bugzilla.gnome.org/show_bug.cgi?id=660084 --- js/ui/telepathyClient.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js index 4bd5097f4..43e142317 100644 --- a/js/ui/telepathyClient.js +++ b/js/ui/telepathyClient.js @@ -305,6 +305,8 @@ Client.prototype = { Shell.get_tp_contacts(conn, [targetHandle], contactFeatures, Lang.bind(this, this._createAudioVideoSource, channel, context, dispatchOp)); + + context.delay(); }, _createAudioVideoSource: function(connection, contacts, failed, channel, context, dispatchOp) { @@ -338,6 +340,8 @@ Client.prototype = { Shell.get_tp_contacts(conn, [targetHandle], contactFeatures, Lang.bind(this, this._createFileTransferSource, channel, context, dispatchOp)); + + context.delay(); }, _createFileTransferSource: function(connection, contacts, failed, channel, context, dispatchOp) {