From fc88987e11f628c20036d49fcaab0e0bb694f68e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Feb 2020 02:05:58 +0100 Subject: pkgs/psi: Temporarily disable Jingle sessions When getting an incoming file transfer, Psi has crashed a while ago and I unfortunately don't remember the exact details. However, since those stanzas are going to be re-delivered every time we start Psi again, I'd like to debug this in an isolated environment rather than being more or less forced to stay unavailable (especially annoying if someone is trying to send a file and then you stay offline for hours). So until I get to debugging this and ideally also test this in an automated fashion, I'll disable it for now since I'm not using Jingle sessions at the moment. Signed-off-by: aszlig --- pkgs/aszlig/psi/default.nix | 1 + pkgs/aszlig/psi/disable-jingle.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/aszlig/psi/disable-jingle.patch (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index 3d7e4c38..d2e43d76 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation rec { patches = [ ./disable-xep-0232.patch ./darkstyle.patch + ./disable-jingle.patch (substituteAll { src = ./config.patch; inherit jid resource; diff --git a/pkgs/aszlig/psi/disable-jingle.patch b/pkgs/aszlig/psi/disable-jingle.patch new file mode 100644 index 00000000..d76b9451 --- /dev/null +++ b/pkgs/aszlig/psi/disable-jingle.patch @@ -0,0 +1,12 @@ +diff --git a/iris/src/xmpp/xmpp-im/jingle.cpp b/iris/src/xmpp/xmpp-im/jingle.cpp +index 0ac149a..e445acf 100644 +--- a/iris/src/xmpp/xmpp-im/jingle.cpp ++++ b/iris/src/xmpp/xmpp-im/jingle.cpp +@@ -1681,6 +1681,7 @@ namespace XMPP { namespace Jingle { + + Session *Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl) + { ++ return nullptr; + if (d->maxSessions > 0 && d->sessions.size() == d->maxSessions) { + d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Wait, XMPP::Stanza::Error::ResourceConstraint); + return nullptr; -- cgit 1.4.1