[35209] trunk/dports/net/psi-otr

[rowue at macports.org]

Revision: 35209
          http://trac.macosforge.org/projects/macports/changeset/35209
Author:   rowue at macports.org
Date:     2008-03-20 14:40:14 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
Bad ugly workaround for bug in communication with non-otr clients

Modified Paths:
--------------
    trunk/dports/net/psi-otr/Portfile

Added Paths:
-----------
    trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff

Modified: trunk/dports/net/psi-otr/Portfile
===================================================================
--- trunk/dports/net/psi-otr/Portfile	2008-03-20 19:46:10 UTC (rev 35208)
+++ trunk/dports/net/psi-otr/Portfile	2008-03-20 21:40:14 UTC (rev 35209)
@@ -4,6 +4,7 @@
 
 name            psi-otr
 version         0.3
+revision        1
 categories      net chat
 maintainers     rowue at digitalis.org
 description     otr-plugin for psi - for plugin-enabled psi
@@ -20,11 +21,12 @@
 checksums       md5 1d3c073b3f77376e521eb15a88d66d5a \
                 sha1 9294112c51d54caa66e81162d75d425b08fe663b \
                 rmd160 31540ec1878616b8e64dfc3d4cd9913dc494f146
-
+ 
 depends_lib     port:psi \
                 port:libotr
 
 patchfiles      patch-psi-otr.pro.diff \
+                patch-src-psi-otr.cpp.diff \
                 patch-src-otrconnection.cpp.diff
 
 configure {

Added: trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff
===================================================================
--- trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff	                        (rev 0)
+++ trunk/dports/net/psi-otr/files/patch-src-psi-otr.cpp.diff	2008-03-20 21:40:14 UTC (rev 35209)
@@ -0,0 +1,29 @@
+--- src/psi-otr.cpp.orig	2008-03-20 19:55:35.000000000 +0100
++++ src/psi-otr.cpp	2008-03-20 22:21:10.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ 
+ #include "psi-otr.h"
++#include <QDebug>
+ 
+ /**
+  * The default constructor.
+@@ -141,8 +142,16 @@
+ 				removeResourceFromJid(fromJid).toStdString().c_str(),
+ 				removeResourceFromJid(toJid).toStdString().c_str(), 
+ 				QString(message.toUtf8()).toStdString().c_str());
+-	
+-	return QString::fromUtf8(encrypted);
++
++	// Bad ugly hack
++	if (encrypted != NULL && strlen(encrypted)>1) {
++		return QString::fromUtf8(encrypted);
++	} else if ((encrypted != NULL) && (strlen(encrypted) != 0)) {
++		return message;
++	}
++
++	return QString();
++
+ }
+ 
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080320/8b9f8b88/attachment.html