diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/configure trunk/configure
--- vendor/psi-0.15/configure	2012-10-04 02:53:02.000000000 +0200
+++ trunk/configure	2012-10-23 16:18:40.000000000 +0200
@@ -1744,18 +1744,36 @@
 	QString path = qc_getenv("PATH");
 	if(!path.isEmpty())
 	{
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 		list = path.split(';', QString::SkipEmptyParts);
 #else
 		list = path.split(':', QString::SkipEmptyParts);
 #endif
 	}
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 	list.prepend(".");
 #endif
 	return list;
 }
 
+#ifdef Q_OS_OS2
+QStringList qc_getpath(const int type)
+{
+	QStringList list;
+        QString path;
+	if (type == 1)
+	path = qc_getenv("CPLUS_INCLUDE_PATH");
+	else
+	path = qc_getenv("LIBRARY_PATH");
+
+	if(!path.isEmpty())
+	{
+		list = path.split(';', QString::SkipEmptyParts);
+	}
+	return list;
+}
+#endif
+
 QString qc_findprogram(const QString &prog)
 {
 	QString out;
@@ -1769,7 +1787,7 @@
 			break;
 		}
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 		// on windows, be sure to look for .exe
 		if(prog.right(4).toLower() != ".exe")
 		{
@@ -1787,7 +1805,7 @@
 
 QString qc_findself(const QString &argv0)
 {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 	if(argv0.contains('\\\\'))
 #else
 	if(argv0.contains('/'))
@@ -2240,6 +2258,9 @@
 	QStringList dirs;
 	dirs += "/usr/local/include";
 	dirs += ext;
+#ifdef Q_OS_OS2
+	dirs += qc_getpath(1);
+#endif
 	for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
 	{
 		if(checkHeader(*it, h))
@@ -2282,6 +2303,18 @@
 		*lib = "/usr/local/lib";
 		return true;
 	}
+#ifdef Q_OS_OS2
+	QStringList dirs;
+	dirs += qc_getpath(2);
+	for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
+	{
+		if(checkLibrary(*it, name))
+		{
+			*lib = *it;
+			return true;
+		}
+	}
+#endif
 	return false;
 }
 
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/irisnet/corelib/corelib.pri trunk/iris/src/irisnet/corelib/corelib.pri
--- vendor/psi-0.15/iris/src/irisnet/corelib/corelib.pri	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/irisnet/corelib/corelib.pri	2012-10-18 15:12:22.000000000 +0200
@@ -33,6 +33,11 @@
 		$$PWD/netinterface_unix.cpp
 }
 
+os2 {
+	SOURCES += \
+		$$PWD/netinterface_unix.cpp
+}
+
 windows {
 	SOURCES += \
 		$$PWD/netinterface_win.cpp
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/irisnet/corelib/irisnetglobal.cpp trunk/iris/src/irisnet/corelib/irisnetglobal.cpp
--- vendor/psi-0.15/iris/src/irisnet/corelib/irisnetglobal.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/irisnet/corelib/irisnetglobal.cpp	2012-10-16 17:42:50.000000000 +0200
@@ -28,7 +28,7 @@
 #ifdef Q_OS_WIN
 extern IrisNetProvider *irisnet_createWinNetProvider();
 #endif
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 extern IrisNetProvider *irisnet_createUnixNetProvider();
 #endif
 extern IrisNetProvider *irisnet_createJDnsProvider();
@@ -183,7 +183,7 @@
 #ifdef Q_OS_WIN
 			addBuiltIn(irisnet_createWinNetProvider());
 #endif
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 			addBuiltIn(irisnet_createUnixNetProvider());
 #endif
 			addBuiltIn(irisnet_createJDnsProvider());
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/irisnet/corelib/netinterface_unix.cpp trunk/iris/src/irisnet/corelib/netinterface_unix.cpp
--- vendor/psi-0.15/iris/src/irisnet/corelib/netinterface_unix.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/irisnet/corelib/netinterface_unix.cpp	2012-10-18 15:13:40.000000000 +0200
@@ -97,8 +97,10 @@
 
 		if(((struct sockaddr *)&ifr->ifr_addr)->sa_family == AF_INET) {
 			sockaddr_len = sizeof(struct sockaddr_in);
+#ifndef Q_OS_OS2
 		} else if(((struct sockaddr *)&ifr->ifr_addr)->sa_family == AF_INET6) {
 			sockaddr_len = sizeof(struct sockaddr_in6);
+#endif
 		} else {
 			sockaddr_len = sizeof(struct sockaddr);
 		}
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/irisnet/noncore/cutestuff/socks.cpp trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp
--- vendor/psi-0.15/iris/src/irisnet/noncore/cutestuff/socks.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp	2012-10-16 17:45:06.000000000 +0200
@@ -27,7 +27,7 @@
 #include <qsocketnotifier.h>
 #include <QByteArray>
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 #include <sys/types.h>
 #include <netinet/in.h>
 #endif
@@ -36,7 +36,7 @@
 #include <windows.h>
 #endif
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 #include <unistd.h>
 #include <fcntl.h>
 #endif
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/irisnet/noncore/turnclient.cpp trunk/iris/src/irisnet/noncore/turnclient.cpp
--- vendor/psi-0.15/iris/src/irisnet/noncore/turnclient.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/irisnet/noncore/turnclient.cpp	2012-10-16 18:09:36.000000000 +0200
@@ -29,7 +29,11 @@
 #include "bytestream.h"
 #include "bsocket.h"
 #include "httpconnect.h"
+#ifdef Q_OS_OS2
+#include "../cutestuff/socks.h"
+#else
 #include "socks.h"
+#endif
 
 namespace XMPP {
 
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/jdns/jdns_p.h trunk/iris/src/jdns/jdns_p.h
--- vendor/psi-0.15/iris/src/jdns/jdns_p.h	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/jdns/jdns_p.h	2012-10-16 16:32:36.000000000 +0200
@@ -32,6 +32,8 @@
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 # define JDNS_OS_WIN
+#elif (__OS2__) || (OS2) || (_OS2)
+# define JDNS_OS_OS2
 #else
 # define JDNS_OS_UNIX
 #endif
@@ -50,7 +52,7 @@
 # include <windows.h>
 #endif
 
-#ifdef JDNS_OS_UNIX
+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
 # include <unistd.h>
 # include <netinet/in.h>
 #endif
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/jdns/jdns_sys.c trunk/iris/src/jdns/jdns_sys.c
--- vendor/psi-0.15/iris/src/jdns/jdns_sys.c	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/jdns/jdns_sys.c	2012-10-22 17:26:46.000000000 +0200
@@ -117,7 +117,7 @@
 # include <windows.h>
 #endif
 
-#ifdef JDNS_OS_UNIX
+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
 # include <netinet/in.h>
 # include <arpa/nameser.h>
 # include <resolv.h>
@@ -632,7 +632,7 @@
 
 #endif
 
-#ifdef JDNS_OS_UNIX
+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
 
 static jdns_dnsparams_t *dnsparams_get_unixfiles()
 {
@@ -644,7 +644,13 @@
 
 	params = jdns_dnsparams_new();
 
+#ifdef JDNS_OS_OS2
+	char resolvFile[MAXPATHLEN];
+	sprintf(resolvFile, "%s/resolv2", getenv("ETC"));
+	f = jdns_fopen(resolvFile, "r");
+#else
 	f = jdns_fopen("/etc/resolv.conf", "r");
+#endif
 	if(!f)
 		return params;
 	while(1)
@@ -717,8 +723,13 @@
 		return -1;
 	return mac_res_init();
 #else
+#ifdef JDNS_OS_OS2 // on os2 we don't care about returncode
+	res_init();
+	return 0;
+#else
 	return res_init();
 #endif
+#endif
 }
 #endif
 
@@ -752,6 +763,7 @@
 	if(n == -1)
 		return params;
 
+#ifndef JDNS_OS_OS2 //no ipv6 on os2
 	// nameservers - ipv6
 	for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n)
 	{
@@ -775,7 +787,7 @@
 		jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
 		jdns_address_delete(addr);
 	}
-
+#endif
 	// nameservers - ipv4
 	for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n)
 	{
@@ -837,7 +849,13 @@
 		params = dnsparams_get_unixfiles();
 	}
 
+#ifdef JDNS_OS_OS2
+	char hostsFile[MAXPATHLEN];
+	sprintf(hostsFile, "%s/hosts", getenv("ETC"));
+	apply_hosts_file(params, hostsFile);
+#else
 	apply_hosts_file(params, "/etc/hosts");
+#endif
 
 	return params;
 }
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/jdns/qjdns_sock.cpp trunk/iris/src/jdns/qjdns_sock.cpp
--- vendor/psi-0.15/iris/src/jdns/qjdns_sock.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/jdns/qjdns_sock.cpp	2012-10-16 16:48:10.000000000 +0200
@@ -33,7 +33,7 @@
 # include <ws2tcpip.h>
 #endif
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 # include <sys/time.h>
 # include <sys/types.h>
 # include <sys/socket.h>
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/xmpp/xmpp-core/connector.cpp trunk/iris/src/xmpp/xmpp-core/connector.cpp
--- vendor/psi-0.15/iris/src/xmpp/xmpp-core/connector.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/xmpp/xmpp-core/connector.cpp	2012-10-22 17:34:34.000000000 +0200
@@ -41,7 +41,11 @@
 #include "bsocket.h"
 #include "httpconnect.h"
 #include "httppoll.h"
+#ifdef Q_OS_OS2
+#include "../../irisnet/noncore/cutestuff/socks.h"
+#else
 #include "socks.h"
+#endif
 
 //#define XMPP_DEBUG
 
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/iris/src/xmpp/xmpp-im/s5b.cpp trunk/iris/src/xmpp/xmpp-im/s5b.cpp
--- vendor/psi-0.15/iris/src/xmpp/xmpp-im/s5b.cpp	2012-10-04 02:53:08.000000000 +0200
+++ trunk/iris/src/xmpp/xmpp-im/s5b.cpp	2012-10-16 18:13:20.000000000 +0200
@@ -27,7 +27,11 @@
 #include <qca.h>
 #include "xmpp_xmlcommon.h"
 #include "im.h"
+#ifdef Q_OS_OS2
+#include "../../irisnet/noncore/cutestuff/socks.h"
+#else
 #include "socks.h"
+#endif
 #include "safedelete.h"
 
 #ifdef Q_OS_WIN
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/os2/app.ico trunk/os2/app.ico
--- vendor/psi-0.15/os2/app.ico	1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/app.ico	2012-10-18 21:15:20.000000000 +0200
@@ -0,0 +1,30 @@
+BA(HCI�
+ 

���CI0
����R0������ݧ�Ť�g@���������������ޒZ���������k��H��%������z�b�Js2P���������k��Hs�%W�U�I�=�1�%sP���������kk�HH�%%�����sP๏Šy����k�sH�W%�U�I�=�1�%sP����xԎ��k��H��%�����z�b�Js2P�Ϛ�������k��H��%����ܹ���ssPP�Ж��t��T�k��H��%������z�b}V:iO:���ǡ임֋g�Y�F��W�~C�uH�N&u9#P�Դ���қz�pe�aA�M����sP�Ã�¦Ҟ{�wh�n]�kH�H�O/�5(y6z4P����Ш�ְ�t�_�W��k܂]�`:�eF�A3T0�؛��u��u��|��L��X�����oC�fD{D*vO4�ڥ�č�����j�L��%����z�b�Js2P���ߺ���ks�HW�%U�I�=�1�%sP��Ա�����k�kH�H%�%����sP����ǎ��k��H�s%�W�U�I�=�1s%P�������k��H��%����ܒ�z�bsJP2���������k��H��%����������ssPP�����њ�ϕ����v�hݞk��jӋf�xF�rS{Y9�WFfK3_B.Q6"&&&BA(�CI0 @

���CI0
  


#	;=>>>??AB	C
+EFFG
G!I#J$L%O%R&T&V'X'Y'[%]#
^"b"e"h"k"n#q$
s't)u)x)|,�.�0�0�0�-�,�,�+�+�,�-�/�/�-�+�+�.�2�6�:�=�B"�F%�J(�N,�R.�U1�W3�Z5�]6�_7�_7�_7�`8�`8�a8�b8�b7�b5�_2�^1�]0�_1�a3�d5�h9�l=�pB�vH�zL�}O�QɁTʄVʆXʈỶZ΋[ϋ[ы[ӊ[ՊZ؈Z݄X߁W�~U�|T�zR�zN�zL�{K�|K�L�M�N��N�N��O��O��N��O��N��P��T��V��W��Y��\��^��`��a��c��d��e��g��h�j�l�o�q�r�r�r�r�r��r��r��r��q��q��r��s��u��w��y��z��|��~�������������������������������������������������������—�Ř�Ǘ�ɘ�˘�̚�̜�͞�ϟ�͡�ͣ�˥�˧�ʩ�ʫ�̯�ϲ�д�Ѷ�Զ�ֶ�ٵ�۳�ݲ�ޱ�߱���������������������������������������������������������������������BA(�	CI00`

���CI000




"
+
&
*

-
/
149>BHMSVZ`$
+b%d'h'j)
n*
o+r-t-v,y)
|%�&�&�&�&�&�&
+�,
�2�6�9�;�;�;�7�5�2�/
�,�*�*�+�,�-�-
�-
�/�2�6�8�<�?�@�A�B�C�D�E�F�G�J�M �O"�P$�T&�V'�Y(�[*�^,�a-�b.�c/�c0�d0�d2�d5�d6�d7�d7�d6�d6�d6�c6�c6�b6�b5�d4�b2�a1�a1�`0�`0�_/�^.�^-�_-�_.�`/�c1�f4�i8�o=�sA�vC�wF�yH�}JـLہN݂O߂O�O�N�N�N�M�~K�|H�|E�zB�y@�y@�z@�}B��B��B��B��D��E��E��F��H��I��K��L��N��P��R��T��V��W��X��Z��[��\��]��_��`��`��`��a��b��d��e��f��h��j��k��l��m��n��o��p��p��r��s��u��v��x��y��{��|��{��|��~�������������������������ˆ�Ê�Ō�ƍ�ǐ�ɒ�ɓ�ǔ����������������������¡�¡�â�á�š����˝�͜�ϛ�Л�ѝ�ҟ�Ѣ�ѥ�ѧ�Щ�έ�ΰ�ϳ�϶�ѷ�Ը�ض�۳�޲������������������������������BA( 
+CI0 

���CI�
BA(h
+CI�  @

���CI�!  
BA(CI�-0`

���CI�000
���������G�g�g�'�'�7�1�����8�g��9��P���f\��Eh�򀢠������
+��p�^�onyq��]m���i���r����tk���lux�	��j�������������vw����������������������������
����0@�0`�80?�8?�8?�<���������������������'���G����������?����u�����_����%[����s\,>�����������z3��������������_�ཾ��о����̽��g̽�ϣi����q�̼��^e̳������ch�����3p���s�����n����so���t����)�����4����!����D����]����B����hp����l���ik��������&��������6����A��ư;��ɺHo���I@i���Wl���jk���XF�p����oU��Ӊj���Wk������q��ՠ7k���W�������Wp�׻Kl���XSl����lT���kTmlmLP��ى��ܳ;3.-l���L[����zO���lA�v�`����\��v���ٺIr~A�{QQQQ\������T�������������������������
�����
�����
�����?��������
��������?�����������`��
�0��
�8��
�<��
�>
���
����
�������p���p����x����8���@8���8���<���<���<���<���~���������
�����
�����
�G�������������������������c����f�����?����������������������ģ�������!�������44������x$�������4���������ɽ�y( ����������������5(�������������������4����������������������s}�����������������������l�������շ���������������ou������66������m4���������7|����Ӿ,������k�������!������}}����ϺW�������{�̹���uo�¹���4Y�ɳ��̺(�ɳ���y�±���rdɹ����op±��‹�¯��‰�¯��§6������!j������!m������5������67������5������kh�����i������ne������O������k������T������(������3P������%������5X�����U����Ȯ7]�����R8����֎`�����TV�����U����ܤ.R�����aO���ôWV_1*\���ܻ7;����ۖ*8���ûZ�ĥ�������S����ܴ::�����\<����������TT�����R;�����\S����������NA�����a?���û[>[���������=0������,B�����_FR������֓GY����@G�����SDEITVTGDE�����I>�����\b����/L�����B����&��uC�����Iʱ&����w0�����aQ~����(a����0r��tx��H�����D������}C�����b��mi��@UjjjjJ=9*n��r*���a����V���BEE���������C���#�����
��	
u=๏��iO:3ߺ����ŠyQ6"vO4�Ϛ�ݧ�њ�ڥ��}V:k1��Ж�v����č�x�ϕ�؛�fD�tC��ݞkd%�h�Ã{D*�oC������T0�_1��jޒZA	�xF��u�g@�L��u�uHd	�H��TW'�D ��X�~C�B��W�M%�N&��u�R0M��k��tHf�F��LK y6�`:�ǡӋf,܂]�Шu9#�W��|`)�"
+�_�Ш�Դ֋g<�O/�ְ�eF6�Y���l,�+�:�aA�kH�)�'�Ť�t.p)z4.i임�¦RW1_B.fK3{Y9%�n]����A3X)Ҟ{�rS��jF%�*�wh�5(a�WFқzp;&�
�pe�G0����������������������
������?� ?�0�������������
��
�������������� 


�x/����›����ʠ�Q^+ｑ���������ݸ�	�d6���������͝E1�P+Փc���ݩ�ݨ��۟q�wM�U1K$	
o8������פ�ԝ�Ӝ�ף�������͜ʊZY*l4�Ǔ���Η�̑�ϗ�Ζ�Ζ�Ε�Ε�ϕ�Δ�ա���˗�\45�j�۩�Ç�ŋ�ҟ�ѡ�Μ�ň�ǎ�Ф�Р�ա�nj�Ç�Ҝ�٥�n?�A�Ȕ�‡����Ι�k�d2����ˆ����Ǔ�sC֍]�͙�ǎ��}�ō�ҝ�Z0�a7�Ȑ��v����wl(b�k�É��v�ʐ�b>�`2��������t�È���`)�q>�����l����zL�}I�����n���ޒ`�n5�����u��l�Ĉ�|L�g5��y��e��x�}N�Y,��x��j��o��oG
�yF��|��g��o��s]&�I!��i��a��f��^=�?��b��f��`��n�A"�3��c��f��_��q�X1p$�N��]��U��b�9�*�~F��a��U��b�d8�n;��b��T��a�~I�c1��W��K��T�\.�Z+��U��F��O�z?&	�Q#��T��O��R��OO�7��G��H��R�|@,�9��V��e��b��R\�2�}=��C��B��Gv/7�I��������rl#�#��W�ƣ�������7H�n8��d��O��C�:2�)
2�V,�—�������J"�_1�������—�Y-�]1��������p�E
�+��Z�n>�tC�������ş�i<	�9����Ģ�š�|L/�R'�������w�J"7�S)����������������ʨ�pCu��g�ʪ�Ǧ��mc�O$��~�����u�I!�"�s>�™�Ȧ�ɪ�ˮ�Ӹ�Ŝ�H"e�l?�̫�ƪ����1�V*�Ř�Ý����K$	�)�4�Y.�_�������v�Y.v�B�ž�Ȯ�ƣ�S+�:�a6�^6�_4�0���#�&� 
��!����Ϸ�Ͱ�yK8
;
+�	�Y����Ϻ��xnBY2?%P2Z7G+>�P1�Ծ�ѿ����)�W-��iGצuݴ�9�Ċ��Z�%�ê����к�Q5B
^{6��̥vVV%�ଛkA�
�����������sI
�L5���跏;�{X��d/��g�ɷ�°����
+�tWӏr=v/���̋_.����
+��8
4�E2������c}
噊����q�!��]R�3*�	��������
����������������������������
�������?���������������
���
�����@��@��`� �� �� ����������
��
��
��<
��<��|���������������������� ������@���@����p�����?�����������
'
�t0�n�|�y�y�z�~�YB!�h#�ə����������������ܫa/
�O�������������庈I�L�ް�����������Ǩe4
n)
��z����ީ�ު�����ގT]!1

$�EԀH�l�ͥ����٣�٣�ء���ز����tێX�h5|<-a)	�M�ҡ������߳�إ�՞�՞�՝�֡�ޯ����������Ϟ�d�R!3
w4��k���߳�Ҝ�З�З�И�њ�њ�њ�љ�З�З�З�љ�ՠ�޲���ש�^�>
Z$��c���բ�ː�̔�̔�̒�̓�̒�͕�͕�͕�Ζ�̓�̓�̑�˒�ː�͔�٪������_*'
�u:�ٮ�Н�ĉ�Ǎ�ŋ�Ǐ�ҡ�׬�Ң�ƍ�nj�Ɗ�Ϝ�֬�֨�ў�Ȑ�Ŋ�ƌ�Ŋ�ȑ�ܱ�О�o5,
j+��z�է����‡����ǐ�֪�����q�͢�ǎ�������ʔ�ˢ��v�ǖ�ש�Κ����†�������ӥ�͜�g1�S&�͜�Č���������Ӧ��f�G�A����ʖ���������˚�f/�B�O�œ�С�����������~�ѡ�Œ�N
�s@�ϝ��|��{��y�ɗ��x�3g%	��`�˙��z��{��z�ϝ��R 4�a)��z�ϟ��}��{��{��{�Р��if&
+�:�K�ő��t��u��w�ǔ�uB�t?�Œ��x��u��s�Č��rY!
+�^#��s�Ǔ��t��u��t��|�ɗ�o:	�E�~H�����m��m��t����V,
�Z'�����z��m��n��z����?�`'��{�����l��o��k�����rz0�E�wA�����i��i��n����`3�C��f��}��h��j��m����b4
�@�n7�����q��i��i��n����g5�]-��{��g��c��d��{�{G%
+�.�I��|��d��e��d��|�N-

�3��Y��{��d��e��c��z��\R�?��g��h��\��[��m��\e$
�a/��q��b��^��\��k��^d$
�\*��p��c��]��]��f��m�Av'
��K��g��V��V��\��f�E

�B��_��a��W��W��]��d�A�9��S��f��V��X��X��k�f5�c1��a��T��R��S��b�f4$	�;��G��`��R��S��T��a�^/�7�g4��a��S��S��R��`��GE�E��Q��R��M��K��U��DV	u"�_.��W��I��I��H��T�u<<�O!��R��P��L��L��S��My+|'�{=��J��B��A��E��F�5�F��O��R��M��M��Q��Cr$�6�}@��K��F��H��J��L�;-�\'��N��[��e��r��k�S#�6��K��������������d�9]
+�h/��F��?��<��>��A�J 

�7��c�������������s:E�*�h2����������������Q!:�W&��j��n��Z��J��@�R#
V	PU�}D������������X�&	�J��y�á����������m5G�E��m��������}��l�[')(�S"�g+�-
w�f.����������¡��u�=�.
��\�Ģ�����������Py�8��b�����}��|��v�`+5d�s:����[�q7��]����������¡����M��q;�Ý�������¡��l�3	�4��\�����~��{��u�b,:
�-��X�������������������������Q!
:
+�P����Ħ����á����L �/��Z�������{��t�b+?Z�N��~����������������������Ǫ����D
�1
��r�ɫ����������i4L
+�.��Z��������~��w�a,>
+�$
+�`&���á�ť�ť�Ħ�Ʃ�Ȭ�δ�ҳ��P�%���J�ʬ�ä�¤�Ƨ��P��0
��u�ϰ�ţ�á�Ú�d0@�(�1�K�{G��y����ʬ�Ͱ�ΰ�����O�7Z��Z'�ţ�Ū�¤�ɭ��o�,
+�9�r8�}I�zF�zE�{B�NG�#�#�.	�@�O"�S&�N!�:�%��
+�7
����̲�è�ȭ����D(f	wqrsvs	!���	�����a�һ�ƫ�Ƭ�ǧ�b-Y	�
�i9�ӹ�˴�Ʈ�ͷ��S�$	


+	!!


#$
+e
�B�ħ����ɲ�κ��}�$y*�I�MT!
+>	ߓY��ok8؎R�r�X)� �������˷�̹����>7x"�����g6
+r0����h3%����b,���^����ξ�˸�κ�d<e7�I[!
!�xD����9f/�̖�՟w?x�\9�������ͼ�����j�


:�V$�����к\)�e3�����~M_�< �ҿ�������������)"]��c�������{C%P�������~D!g�'
�Ϸ�������������a@jm
����Ҵ�].1#�p5����ǔ�2
+���O4�ZB�V>�V>�Z@�@�
B
+�.u-�X'�������X"*
��
������s�vP�������j5^��fR�˶����Ͷ�S+���������u^�%��
+�$��
\ No newline at end of file
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/os2/psi_os2.rc trunk/os2/psi_os2.rc
--- vendor/psi-0.15/os2/psi_os2.rc	1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/psi_os2.rc	2012-10-18 21:26:14.000000000 +0200
@@ -0,0 +1 @@
+ICON 1 DISCARDABLE "../os2/app.ico"
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/os2/Readme.OS2 trunk/os2/Readme.OS2
--- vendor/psi-0.15/os2/Readme.OS2	1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/Readme.OS2	2013-02-22 16:42:52.000000000 +0100
@@ -0,0 +1,210 @@
+Psi0.15 for OS/2 and eComStation
+--------------------------------
+  This file contains information specific to the OS/2 - eComStation version of 
+  Psi. Before reading it, please refer to the README file that contains
+  general information about Psi.
+
+
+0. CONTENTS OF THIS FILE
+========================
+  1. INTRODUCTION
+  2. REQUIREMENTS
+  3. INSTALLATION
+  4. CONFIGURATION DATA
+  5. KNOWN PROBLEMS
+  6. BUGREPORTS
+  7. CREDITS
+  8. SUPPORT AND DONATIONS
+  9. HISTORY
+
+
+1. INTRODUCTION
+===============
+  Welcome to Psi version 0.15 for OS/2 and eComStation.
+
+
+2. REQUIREMENTS
+===============
+  The following requirements can be installed either by rpm or by zip files  
+  except Extended System Tray widget which is currently available as zip only.
+  
+
+  RPM Installation (preferred):
+  ============================
+  klibc
+  -----
+    1. yum install libc
+  
+  GCC4Core
+  --------
+    1. yum install libgcc
+    2. yum install gcc-stack-protector
+    3. yum install gcc-stdc++-shared-library
+    4. yum install gcc-supc++-shared-library
+  
+  Qt4 dll
+  -------
+    1. yum install libqt4
+    
+  Zlib  
+  ----
+    1. yum install zlib
+  
+  openssl 1.0
+  -----------
+    1. yum install openssl
+
+
+  ZIP Installation:
+  =================
+  klibc    
+  -----
+    1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for 
+        more information)
+    2. Install the files to your libpath eg x:\ecs\dll
+  
+  GCC4Core   
+  --------
+    1. Download GCC4Core 1.2.1 or better from ftp://ftp.netlabs.org/pub/gcc
+    2. Install the files to your libpath eg. x:\ecs\dll
+  
+  Qtcore4   
+  -------
+    1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more 
+      information). 'Qt Runtime Libraries and Plugins' is sufficient.
+    2. Install the files according to the readme
+  
+  Zlib   
+  ----
+    1. Download zlib from f.i. http://rpm.netlabs.org/release/00/zip/
+    2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
+
+  openssl 1.0
+  -----------
+    1. Download openssl from f.i. http://rpm.netlabs.org/release/00/zip
+    2. Unpack and install the dll to your libpath eg. x:\ecs\dll
+
+  Extended System Tray
+  --------------------
+    1. ExtendedSysTray widget for xCenter/eCenter. Not strictly required 
+       but strongly recommended. Get it from here if you do not have it 
+       installed already - ftp://ftp.netlabs.org/pub/qt4/xsystray/
+
+        
+3. INSTALLATION
+===============
+  1.  Unzip the Psi archive containing this file to a directory of your
+      choice and run the Psi executable (psi.exe).
+      
+  2.  Additionally, you can download a Language Pack for your language using
+      the following link: http://psi-im.org/download. Copy the language file 
+      (f.i. psi_de.qm) into the directory of psi.exe. You need to restart Psi to 
+      load the language file.
+  
+  3.  If you want to use the 'PM Default Browser/Mail' setting to open links
+      within chat windows, make sure that you have the default PM browser and
+      mail client applications set up correctly.  The easiest way to do this is
+      to use the 'Configure Internet Applications' tool from Hobbes
+      (http://hobbes.nmsu.edu/pub/os2/apps/misc/configapps1_1_1.zip).
+  
+  Please refer to the 'Known Problems' section below for additional information
+  on how to resolve problems you may encounter when running Psi for OS/2.
+
+  Upgrading a previous version
+  ----------------------------
+  If you are upgrading from a previous version of Psi, please always use a clean 
+  directory to install the new version to avoid possible file conflicts. Psi0.15 
+  uses a new profile data format. Starting Psi0.15 the first time will migrate 
+  your current Psi settings. If you ever want to import the settings of the 
+  older version afterwards again delete the Psi0.15 configuration data trees and 
+  start Psi again. See section 'Configuration Data' for details.
+  
+  Please note that installing a new version to a clean directory will not affect
+  your existing personal configuration data (Psi profiles, account settings, 
+  message history) because it is stored in a separate directory and therefore
+  will be preserved. 
+  
+
+4. CONFIGURATION DATA
+=====================
+  Psi0.15 stores all configuration files (such as Psi profiles, account settings,
+  message history, etc.) in subdirectories of your home directory (pointed to by 
+  the HOME environment variable). Path to home directory is usually set in your 
+  config.sys (SET HOME=xxxxx). You can check your current home setting by entering 
+  'echo %home%' in a command line window. Note that if the HOME variable is 
+  invalid or points to a non-existing location, the .config, .local and .cache 
+  subdirectories will be created in the root directory of the boot drive!
+  
+  Standard eCS installation sets home to x:\home\default. Psi0.15 configuration 
+  is stored in following directories then - 
+  x:\home\default\.local\share\psi
+  x:\home\default\.config\psi
+  x:\home\default\.cache\psi
+  
+  The paths and parameters to the default PM browser and mail client applications
+  are taken from the HINI_USER_PROFILE\WPURLDEFAULTSETTINGS registry key (stored
+  in the X:\OS2\OS2.INI file).
+
+ 
+5. KNOWN PROBLEMS
+=================
+  1. If you have a single-streamed sound card (a card that cannot play
+    more than one sound at a time) and experience problems with sound
+    in Psi (such as 100% CPU load when playing too many sounds
+    simultaneously), try to add the following line to CONFIG.SYS
+    (or to the .CMD script that starts Psi):
+
+        SET QT_PM_NO_SOUND_SHARE=YES
+
+    This will tell the Qt library to open sound devices in the
+    exclusive mode.
+
+  2. The exit button of the Psi window does not close Psi completely but 
+    minimizes Psi as this is the usual behaviour on other platforms. 
+    Unfortunately Psi is not shown in the Window List. To completely close Psi 
+    right button click (RBC) on the Psi symbol in the Extendeded System Tray 
+    xcenter widget. If you have not installed ExtendedSysTray or in case RBC do 
+    not work (f.i. your profile data is not complete) use TOP or KILL or another 
+    process kill utility to exit psi.exe.
+      
+
+6. BUGREPORTS
+=============
+  Please create bugreports at http://svn.netlabs.org/qtapps
+  Only bug reports with a reproducable bug are accepted. 
+  
+
+7. CREDITS
+==========
+  The port was done by Silvan Scherrer aka _diver
+  Thanks go to Dmitry A. Kuminov for all his coding work for eCS
+  Special thanks of course go to the Psi developers - see 
+  http://psi-im.org/about/
+
+
+8. SUPPORT AND DONATIONS
+========================
+  Psi port is based on volunteer work. If you would like to support further
+  development, you can do so in one of the following ways:          
+    * Donate to the Qt4 project: see qt.netlabs.org for more information
+    * Contribute to the project: Besides actual development, this also includes
+      maintaining the documentation and the project web site as well as help for 
+      users.
+
+
+9. HISTORY
+==========
+
+  2013-02-22
+    * repacked with iconsets
+
+  2012-10-26
+    * first official Psi 0.15 port
+  
+  2006-09-26
+    * official Psi 0.10.1 port
+    
+  For general Psi history see README 
+  
+
+2012-10-29 Andreas Buchinger
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/psi.pro trunk/psi.pro
--- vendor/psi-0.15/psi.pro	2012-10-04 02:53:02.000000000 +0200
+++ trunk/psi.pro	2012-10-16 15:57:44.000000000 +0200
@@ -5,6 +5,7 @@
 # configure iris
 unix:system("echo \"include(../src/conf_iris.pri)\" > iris/conf.pri")
 windows:system("echo include(../src/conf_iris.pri) > iris\\conf.pri")
+os2:system("echo include(../src/conf_iris.pri) > iris/conf.pri")
 
 sub_iris.subdir = iris
 sub_src.subdir = src
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/aboutdlg.cpp trunk/src/aboutdlg.cpp
--- vendor/psi-0.15/src/aboutdlg.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/aboutdlg.cpp	2012-10-18 20:19:20.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include "applicationinfo.h"
 #include "aboutdlg.h"
+#include "systeminfo.h"
 
 AboutDlg::AboutDlg(QWidget* parent)
 	: QDialog(parent)
@@ -33,7 +34,7 @@
 
 	setModal(false);
 
-	ui_.lb_name->setText ( QString("<h3><b>%1 v%2</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()) );
+	ui_.lb_name->setText ( QString("<h3><b>%1 v%2 on %3</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()).arg(SystemInfo::instance()->os()) );
 
 	ui_.te_license->setText ( loadText(":/COPYING") );
 
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/applicationinfo.cpp trunk/src/applicationinfo.cpp
--- vendor/psi-0.15/src/applicationinfo.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/applicationinfo.cpp	2012-10-18 13:05:18.000000000 +0200
@@ -136,7 +136,7 @@
 {
 #if defined(Q_WS_X11)
 	return PSI_DATADIR;
-#elif defined(Q_WS_WIN)
+#elif defined(Q_WS_WIN) || defined(Q_OS_OS2)
 	return qApp->applicationDirPath();
 #elif defined(Q_WS_MAC)
 	// FIXME: Clean this up (remko)
@@ -227,7 +227,7 @@
 			QDir configDir(QDir::homePath() + "/Library/Application Support/" + name());
 			QDir cacheDir(QDir::homePath() + "/Library/Caches/" + name());
 			QDir dataDir(configDir);
-#elif defined Q_WS_X11
+#elif defined Q_WS_X11 || defined(Q_OS_OS2)
 			QString XdgConfigHome = QString::fromLocal8Bit(getenv("XDG_CONFIG_HOME"));
 			QString XdgDataHome = QString::fromLocal8Bit(getenv("XDG_DATA_HOME"));
 			QString XdgCacheHome = QString::fromLocal8Bit(getenv("XDG_CACHE_HOME"));
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/common.cpp trunk/src/common.cpp
--- vendor/psi-0.15/src/common.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/common.cpp	2012-10-18 13:08:04.000000000 +0200
@@ -282,7 +282,7 @@
 		return;
 	}
 
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_OS_OS2)
 	QSound::play(str);
 #else
 	QString player = PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString();
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/config.h trunk/src/config.h
--- vendor/psi-0.15/src/config.h	1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/config.h	2012-10-23 16:22:34.000000000 +0200
@@ -0,0 +1,3 @@
+#define PSI_LIBDIR "/usr/local/lib/psi"
+#define PSI_DATADIR "/usr/local/share/psi"
+#define PSI_VERSION "0.15"
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/homedirmigration.cpp trunk/src/homedirmigration.cpp
--- vendor/psi-0.15/src/homedirmigration.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/homedirmigration.cpp	2012-10-22 19:44:18.000000000 +0200
@@ -165,7 +165,7 @@
 
 				QString dstDirName;
 				QRegExp settingsXp("^/psirc$|^/profiles/\\w*/accounts.xml$|^/profiles/\\w*/accounts.xml.backup$|"
-								   "^/profiles/\\w*/options.xml$|^/profiles/\\w*/options.xml.backup$|^/profiles/\\w*/mucskipautojoin.txt$");
+								   "^/profiles/\\w*/options.xml$|^/profiles/\\w*/options.xml.backup$|^/profiles/\\w*/config.xml$|^/profiles/\\w*/mucskipautojoin.txt$");
 
 				QRegExp cacheXp("^/tmp-contentdownloader/.*$|^/tmp-sounds/.*$|^/tmp-pics/.*$|"
 								"^/bob/.*|^/avatars/.*$|^/profiles/\\w*/vcard/.*$|^/caps.xml$|^/tune$");
@@ -256,6 +256,9 @@
 	base = QDir::cleanPath(base);
 
 	oldHomeDir_.setPath(base + "/PsiData");
+#elif defined Q_OS_OS2
+	QString base = QDir::homePath();
+	oldHomeDir_.setPath(base + "/PsiData");
 #endif
 	return oldHomeDir_.exists();
 }
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/globalshortcut/globalshortcut.pri trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri
--- vendor/psi-0.15/src/libpsi/tools/globalshortcut/globalshortcut.pri	2012-10-04 02:53:12.000000000 +0200
+++ trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri	2012-10-18 14:41:42.000000000 +0200
@@ -16,3 +16,6 @@
 	HEADERS += \
 		$$PWD/NDKeyboardLayout.h
 }
+os2: {
+	SOURCES += $$PWD/globalshortcutmanager_pm.cpp
+}
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp
--- vendor/psi-0.15/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp	1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp	2012-10-18 15:08:06.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * globalshortcutmanager_pm.cpp - PM implementation of global shortcuts
+ * Copyright (C) 2003-2006  Justin Karneges, Maciej Niedzielski
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+/****** @todo this is heavily needed so do it once */
+
+#include "globalshortcutmanager.h"
+#include "globalshortcuttrigger.h"
+
+#include <QWidget>
+
+class GlobalShortcutManager::KeyTrigger::Impl : public QWidget
+{
+public:
+	/**
+	 * Constructor registers the hotkey.
+	 */
+	Impl(GlobalShortcutManager::KeyTrigger* t, const QKeySequence& ks)
+	{
+	}
+
+	/**
+	 * Destructor unregisters the hotkey.
+	 */
+	~Impl()
+	{
+	}
+
+	/**
+	 * Triggers triggered() signal when the hotkey is activated.
+	 */
+
+private:
+
+};
+
+
+GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
+{
+	d = new Impl(this, key);
+}
+
+GlobalShortcutManager::KeyTrigger::~KeyTrigger()
+{
+	delete d;
+	d = 0;
+}
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/idle/idle.pri trunk/src/libpsi/tools/idle/idle.pri
--- vendor/psi-0.15/src/libpsi/tools/idle/idle.pri	2012-10-04 02:53:12.000000000 +0200
+++ trunk/src/libpsi/tools/idle/idle.pri	2012-10-18 14:31:18.000000000 +0200
@@ -11,3 +11,6 @@
 mac: {
 	SOURCES += $$PWD/idle_mac.cpp
 }
+os2 {
+	SOURCES += $$PWD/idle_x11.cpp
+}
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/simplecli/simplecli.cpp trunk/src/libpsi/tools/simplecli/simplecli.cpp
--- vendor/psi-0.15/src/libpsi/tools/simplecli/simplecli.cpp	2012-10-04 02:53:12.000000000 +0200
+++ trunk/src/libpsi/tools/simplecli/simplecli.cpp	2012-10-18 13:15:54.000000000 +0200
@@ -83,7 +83,7 @@
   */
 QMap<QString, QString> SimpleCli::parse(int argc, char* argv[], const QStringList& terminalArgs, int* safeArgc)
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
 	const bool winmode = true;
 #else
 	const bool winmode = false;
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/spellchecker/aspellchecker.cpp trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp
--- vendor/psi-0.15/src/libpsi/tools/spellchecker/aspellchecker.cpp	2012-10-04 02:53:12.000000000 +0200
+++ trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp	2012-10-18 13:17:00.000000000 +0200
@@ -38,7 +38,7 @@
 	speller_ = NULL;
 	config_ = new_aspell_config();
 	aspell_config_replace(config_, "encoding", "utf-8");
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
 	aspell_config_replace(config_, "conf-dir", QDir::homePath().toLocal8Bit().data());
 	aspell_config_replace(config_, "data-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
 	aspell_config_replace(config_, "dict-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/libpsi/tools/systemwatch/systemwatch.pri trunk/src/libpsi/tools/systemwatch/systemwatch.pri
--- vendor/psi-0.15/src/libpsi/tools/systemwatch/systemwatch.pri	2012-10-04 02:53:12.000000000 +0200
+++ trunk/src/libpsi/tools/systemwatch/systemwatch.pri	2012-10-18 14:28:20.000000000 +0200
@@ -14,3 +14,7 @@
 	HEADERS += $$PWD/systemwatch_mac.h
 	SOURCES += $$PWD/systemwatch_mac.cpp
 }
+os2 {
+	HEADERS += $$PWD/systemwatch_unix.h
+	SOURCES += $$PWD/systemwatch_unix.cpp
+}
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/main.cpp trunk/src/main.cpp
--- vendor/psi-0.15/src/main.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/main.cpp	2012-10-16 17:57:34.000000000 +0200
@@ -461,7 +461,7 @@
 	QByteArray val = qgetenv("QT_PLUGIN_PATH");
 	if(!val.isEmpty())
 	{
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
 		QLatin1Char pathSep(';');
 #else
 		QLatin1Char pathSep(':');
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/options/opt_sound.cpp trunk/src/options/opt_sound.cpp
--- vendor/psi-0.15/src/options/opt_sound.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/options/opt_sound.cpp	2012-10-18 13:24:28.000000000 +0200
@@ -170,6 +170,8 @@
 	d->le_player->setText(tr("Windows Sound"));
 #elif defined(Q_WS_MAC)
 	d->le_player->setText(tr("Mac OS Sound"));
+#elif defined(Q_OS_OS2)
+	d->le_player->setText(tr("eComStation(OS/2) Sound"));
 #else
 	d->le_player->setText( PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString() );
 #endif
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/src.pri trunk/src/src.pri
--- vendor/psi-0.15/src/src.pri	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/src.pri	2012-10-18 14:24:46.000000000 +0200
@@ -572,6 +572,10 @@
 	SOURCES += $$PWD/activeprofiles_stub.cpp
 }
 
+os2 {
+	SOURCES += $$PWD/activeprofiles_stub.cpp
+}
+
 mac {
 	QMAKE_LFLAGS += -framework Carbon -framework IOKit -framework AppKit
 }
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/src.pro trunk/src/src.pro
--- vendor/psi-0.15/src/src.pro	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/src.pro	2012-10-18 21:08:58.000000000 +0200
@@ -148,6 +148,9 @@
 	# buggy MSVC workaround
 	win32-msvc|win32-msvc.net|win32-msvc2005: QMAKE_LFLAGS += /FORCE:MULTIPLE
 }
+os2 {
+	RC_FILE = ../os2/psi_os2.rc
+}
 mac {
 	# Universal binaries
 	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,x86_64) {
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/systeminfo.cpp trunk/src/systeminfo.cpp
--- vendor/psi-0.15/src/systeminfo.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/systeminfo.cpp	2013-02-28 11:28:06.000000000 +0100
@@ -169,14 +169,14 @@
 	os_str_ = "Unknown";
 	
 	// Detect
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_OS2)
 	time_t x;
 	time(&x);
-	char str[256];
+	char str[256] = "\0";
 	char fmt[32];
 	strcpy(fmt, "%z");
 	strftime(str, 256, fmt, localtime(&x));
-	if(strcmp(fmt, str)) {
+	if(*str && strcmp(fmt, str)) {
 		QString s = str;
 		if(s.at(0) == '+')
 			s.remove(0,1);
@@ -185,7 +185,7 @@
 	}
 	strcpy(fmt, "%Z");
 	strftime(str, 256, fmt, localtime(&x));
-	if(strcmp(fmt, str))
+	if(*str && strcmp(fmt, str))
 		timezone_str_ = str;
 #endif
 #if defined(Q_WS_X11)
@@ -210,6 +210,39 @@
 #endif
 	else
 		os_str_ = "Mac OS X";
+#elif defined(Q_OS_OS2)
+	QSysInfo::Os2Version v = QSysInfo::os2Version();
+	if(v == QSysInfo::OV_Unknown)
+		os_str_ = "Unknown";
+	else if(v == QSysInfo::OV_2_0)
+		os_str_ = "OS/2 2.0";
+	else if(v == QSysInfo::OV_2_1)
+		os_str_ = "OS/2 2.1";
+	else if(v == QSysInfo::OV_2_11)
+		os_str_ = "OS/2 2.11";
+	else if(v == QSysInfo::OV_3_0)
+		os_str_ = "OS/2 Warp 3";
+	else if(v == QSysInfo::OV_4_0)
+		os_str_ = "OS/2 Warp 4";
+	else if(v == QSysInfo::OV_4_5)
+		os_str_ = "OS/2 Warp 4.5";
+	else if(v == QSysInfo::OV_4_52)
+		os_str_ = "OS/2 Warp 4.52";
+	else if(v == QSysInfo::OV_ECS_Unknown)
+		os_str_ = "eComStation";
+	else if(v == QSysInfo::OV_ECS_1_0)
+		os_str_ = "eComStation 1.0";
+	else if(v == QSysInfo::OV_ECS_1_1)
+		os_str_ = "eComStation 1.1";
+	else if(v == QSysInfo::OV_ECS_1_2)
+		os_str_ = "eComStation 1.2";
+	else if(v == QSysInfo::OV_ECS_2_0)
+		os_str_ = "eComStation 2.0";
+	else if(v == QSysInfo::OV_ECS_2_1)
+		os_str_ = "eComStation 2.1";
+	else if(v == QSysInfo::OV_ECS_2_2)
+		os_str_ = "eComStation 2.2";
+
 #endif
 
 #if defined(Q_WS_WIN)
diff -Naur -x Makefile -x '*.dll' -x conf.pri -x '*.zip' -x '*.exe' -x '*.map' -x '*.obj' -x '*.moc' -x '*.rcc' -x iris.prl -x irisnet.prl -x '*.sym' -x .ui -x '*.bak' -x '*.lib' -x '*.rsp' -x 'moc_*.cpp' -x Info.plist vendor/psi-0.15/src/textutil.cpp trunk/src/textutil.cpp
--- vendor/psi-0.15/src/textutil.cpp	2012-10-04 02:53:02.000000000 +0200
+++ trunk/src/textutil.cpp	2012-10-16 17:59:02.000000000 +0200
@@ -98,7 +98,7 @@
 	int col = 0;
 
 	for(int i = 0; i < (int)plain.length(); ++i) {
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 		if(plain[i] == '\r' && i+1 < (int)plain.length() && plain[i+1] == '\n')
 			++i;	// Qt/Win sees \r\n as two new line chars
 #endif