Current version is 0.16.383:

Psi+ was updated. Iris was updated. Plugins were updated. Extra patches were updated.
psi-plus · Sep 17, 2014 · 3913f4b · 3913f4b
1 parent bde9c7c
commit 3913f4b
Show file tree

Hide file tree

Showing 38 changed files with 159 additions and 270 deletions.
diff --git a/iconsets.qrc b/iconsets.qrc
@@ -96,7 +96,7 @@
         <file>iconsets/system/default/notification_chat_receive.png</file>
         <file>iconsets/system/default/notification_chat_send.png</file>
         <file>iconsets/system/default/notification_chat_time.png</file>
-        <file>iconsets/system/default/tango-throbber.mng</file>
+        <file>iconsets/system/default/throbber.png</file>
         <file>iconsets/system/default/theme_title_texture.png</file>
         <file>iconsets/system/default/psiplus/activity.png</file>
         <file>iconsets/system/default/psiplus/mood.png</file>

diff --git a/iconsets/system/default/icondef.xml b/iconsets/system/default/icondef.xml
@@ -432,6 +432,12 @@
 		<object mime='image/png'>theme_title_texture.png</object>
 	</icon>
 
+	<icon>
+		<x xmlns='name'>psi/throbber</x>
+		<x xmlns='type'>animation</x>
+		<object mime='image/png'>throbber.png</object>
+	</icon>
+
 	<!-- Whiteboarding -->
 	<icon>
 		<x xmlns='name'>psi/whiteboard</x>

diff --git a/iconsets/system/default/tango-throbber.mng b/iconsets/system/default/tango-throbber.mng
diff --git a/iconsets/system/default/throbber.png b/iconsets/system/default/throbber.png
diff --git a/iris/include/iris/xmpp_bitsofbinary.h b/iris/include/iris/xmpp_bitsofbinary.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/xmpp_bitsofbinary.h"
diff --git a/iris/src/jdns/src/jdns/jdns_p.h b/iris/src/jdns/src/jdns/jdns_p.h
@@ -40,6 +40,8 @@
 # define JDNS_OS_FREEBSD
 #elif defined(__NetBSD__)
 # define JDNS_OS_NETBSD
+#elif defined(__OpenBSD__)
+# define JDNS_OS_OPENBSD
 #elif defined(sun) || defined(__sun)
 # define JDNS_OS_SOLARIS
 #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))

diff --git a/iris/src/jdns/src/jdns/jdns_sys.c b/iris/src/jdns/src/jdns/jdns_sys.c
@@ -729,6 +729,10 @@ static int my_res_init()
 #if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \
     defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS)
 # define USE_EXTEXT
+#endif
+#if defined(JDNS_OS_OPENBSD)
+# define USE_INDEP_EXT
+
 #endif
 
 static jdns_dnsparams_t *dnsparams_get_unixsys()
@@ -752,6 +756,21 @@ static jdns_dnsparams_t *dnsparams_get_unixsys()
 	if(n == -1)
 		return params;
 
+#ifdef USE_INDEP_EXT
+	for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
+	{
+		struct sockaddr_in *sa = (struct sockaddr_in*)&(_res_ext.nsaddr_list[n]);
+		jdns_address_t *addr = jdns_address_new();
+		if (sa->sin_family = AF_INET6) {
+			struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa;
+			jdns_address_set_ipv6(addr, sa6->sin6_addr.s6_addr);
+		} else {
+			jdns_address_set_ipv4(addr, ntohl(sa->sin_addr.s_addr));
+		}
+		jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
+		jdns_address_delete(addr);
+	}
+#else
 	// nameservers - ipv6
 #ifdef __GLIBC__
 	for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount6; ++n)
@@ -788,6 +807,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys()
 		jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
 		jdns_address_delete(addr);
 	}
+#endif
 
 	// domain name
 	if(strlen(RESVAR.defdname) > 0)

diff --git a/iris/src/xmpp/base64/base64.cpp b/iris/src/xmpp/base64/base64.cpp
diff --git a/iris/src/xmpp/base64/base64.h b/iris/src/xmpp/base64/base64.h
diff --git a/iris/src/xmpp/base64/base64.pri b/iris/src/xmpp/base64/base64.pri
diff --git a/iris/src/xmpp/base64/unittest/base64test.cpp b/iris/src/xmpp/base64/unittest/base64test.cpp
diff --git a/iris/src/xmpp/base64/unittest/unittest.pri b/iris/src/xmpp/base64/unittest/unittest.pri
diff --git a/iris/src/xmpp/base64/unittest/unittest.pro b/iris/src/xmpp/base64/unittest/unittest.pro
diff --git a/iris/src/xmpp/modules.pri b/iris/src/xmpp/modules.pri
@@ -3,4 +3,3 @@ IRIS_XMPP_JID_MODULE = $$PWD/jid/jid.pri
 IRIS_XMPP_SASL_MODULE = $$PWD/sasl/sasl.pri
 IRIS_XMPP_BASE_MODULE = $$PWD/base/base.pri
 IRIS_XMPP_ZLIB_MODULE = $$PWD/zlib/zlib.pri
-IRIS_XMPP_BASE64_MODULE = $$PWD/base64/base64.pri
diff --git a/iris/src/xmpp/sasl/digestmd5response.cpp b/iris/src/xmpp/sasl/digestmd5response.cpp
@@ -25,7 +25,6 @@
 
 #include "xmpp/sasl/digestmd5proplist.h"
 #include "xmpp/base/randomnumbergenerator.h"
-#include "xmpp/base64/base64.h"
 
 namespace XMPP {
 
@@ -47,7 +46,7 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString&
 	for(int n = 0; n < (int)a.size(); ++n) {
 		a[n] = (char) rand.generateNumberBetween(0, 255);
 	}
-	QByteArray cnonce = Base64::encode(a).toLatin1();
+	QByteArray cnonce = a.toBase64();
 
 	// make other variables
 	if (realm.isEmpty()) {

diff --git a/iris/src/xmpp/sasl/scramsha1message.cpp b/iris/src/xmpp/sasl/scramsha1message.cpp
@@ -26,7 +26,6 @@
 
 #include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/jid/jid.h"
-#include "xmpp/base64/base64.h"
 
 namespace XMPP {
 
@@ -60,7 +59,7 @@ SCRAMSHA1Message::SCRAMSHA1Message(const QString& authzid, const QString& authci
 		for(int n = 0; n < (int)a.size(); ++n) {
 			a[n] = (char) rand.generateNumberBetween(0, 255);
 		}
-		clientnonce = Base64::encode(a).toLatin1();
+		clientnonce = a.toBase64();
 	} else clientnonce = cnonce;
 
 	QTextStream(&result) << "n,";

diff --git a/iris/src/xmpp/sasl/scramsha1response.cpp b/iris/src/xmpp/sasl/scramsha1response.cpp
@@ -38,7 +38,7 @@ namespace XMPP {
 	SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray& server_first_message, const QByteArray& password_in, const QByteArray& client_first_message, const QString &salted_password_base64, const RandomNumberGenerator& rand)
 {
 	Q_UNUSED(rand);
-	QString pass_in(password_in);
+	QString pass_in = QString::fromUtf8(password_in);
 	QString pass_out;
 
 	QRegExp pattern("r=(.*),s=(.+),i=(\\d+)");