about summary refs log tree commit diff
path: root/pkgs/aszlig
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r--pkgs/aszlig/psi/default.nix1
-rw-r--r--pkgs/aszlig/psi/disable-jingle.patch12
2 files changed, 13 insertions, 0 deletions
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;