source: diffs/psi_0.16.diff@ 184

Last change on this file since 184 was 184, checked in by Silvan Scherrer, 9 years ago

qt diffs: updated djview, updated psi
File size: 67.9 KB
Line 
1diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/configure trunk/configure
2--- vendor/current/configure 2016-05-02 17:29:30.000000000 +0200
3+++ trunk/configure 2016-05-02 17:28:48.000000000 +0200
4@@ -1090,8 +1090,8 @@
5 QString shortname() const { return "qjdns"; }
6 bool exec()
7 {
8-#if defined Q_OS_WIN || defined Q_OS_MAC
9- // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
10+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
11+ // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
12 conf->addExtra("CONFIG += iris-qjdns");
13 return true;
14 #else
15@@ -1207,13 +1207,13 @@
16 qc_qdbus(Conf *c) : ConfObj(c) {}
17 QString name() const { return "QDBUS"; }
18 QString shortname() const { return "qdbus"; }
19-#ifdef Q_OS_WIN
20+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
21 QString checkString() const { return QString(); }
22 #endif
23 bool exec()
24 {
25-#ifdef Q_OS_WIN
26- // skip dbus support on windows
27+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
28+ // skip dbus support on windows and OS/2
29 return false;
30 #else
31 if (!conf->getenv("QC_DISABLE_qdbus").isEmpty())
32@@ -2225,18 +2225,36 @@
33 QString path = qc_getenv("PATH");
34 if(!path.isEmpty())
35 {
36-#ifdef Q_OS_WIN
37+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
38 list = path.split(';', QString::SkipEmptyParts);
39 #else
40 list = path.split(':', QString::SkipEmptyParts);
41 #endif
42 }
43-#ifdef Q_OS_WIN
44+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
45 list.prepend(".");
46 #endif
47 return list;
48 }
49
50+#ifdef Q_OS_OS2
51+QStringList qc_getpath(const int type)
52+{
53+ QStringList list;
54+ QString path;
55+ if (type == 1)
56+ path = qc_getenv("CPLUS_INCLUDE_PATH");
57+ else
58+ path = qc_getenv("LIBRARY_PATH");
59+
60+ if(!path.isEmpty())
61+ {
62+ list = path.split(';', QString::SkipEmptyParts);
63+ }
64+ return list;
65+}
66+#endif
67+
68 QString qc_findprogram(const QString &prog)
69 {
70 QString out;
71@@ -2250,8 +2268,8 @@
72 break;
73 }
74
75-#ifdef Q_OS_WIN
76- // on windows, be sure to look for .exe
77+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
78+ // on windows and OS/2, be sure to look for .exe
79 if(prog.right(4).toLower() != ".exe")
80 {
81 fi = QFileInfo(list[n] + '/' + prog + ".exe");
82@@ -2268,7 +2286,7 @@
83
84 QString qc_findself(const QString &argv0)
85 {
86-#ifdef Q_OS_WIN
87+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
88 if(argv0.contains('\\\\'))
89 #else
90 if(argv0.contains('/'))
91@@ -2414,7 +2432,7 @@
92 searchStart = true;
93 buf.clear();
94 continue;
95-#ifndef Q_OS_WIN /* on windows backslash is just a path separator */
96+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2) /* on windows and OS/2 backslash is just a path separator */
97 } else if (flags[i] == backslash) {
98 escaped = true;
99 continue; // just add next symbol
100@@ -2488,7 +2506,7 @@
101 // Using Windows-style '\\\\' can leads strange compilation error with MSYS which uses
102 // unix style.
103 QLatin1Char nativeSep('/');
104-#ifdef Q_OS_WIN
105+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
106 path.replace(QLatin1Char('\\\\'), QLatin1Char('/'));
107 #endif
108 // trim trailing slashes
109@@ -2894,6 +2912,9 @@
110 QStringList dirs;
111 dirs += "/usr/local/include";
112 dirs += ext;
113+#ifdef Q_OS_OS2
114+ dirs += qc_getpath(1);
115+#endif
116 for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
117 {
118 if(checkHeader(*it, h))
119@@ -2936,6 +2957,19 @@
120 *lib = "/usr/local/lib";
121 return true;
122 }
123+
124+#ifdef Q_OS_OS2
125+ QStringList dirs;
126+ dirs += qc_getpath(2);
127+ for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
128+ {
129+ if(checkLibrary(*it, name))
130+ {
131+ *lib = *it;
132+ return true;
133+ }
134+ }
135+#endif
136 return false;
137 }
138
139diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/configure trunk/iris/configure
140--- vendor/current/iris/configure 2014-04-17 19:29:12.000000000 +0200
141+++ trunk/iris/configure 2014-04-23 10:36:10.000000000 +0200
142@@ -1018,8 +1018,8 @@
143 QString shortname() const { return "qjdns"; }
144 bool exec()
145 {
146-#if defined Q_OS_WIN || Q_OS_MAC
147- // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
148+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
149+ // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
150 conf->addExtra("CONFIG += iris-qjdns");
151 return true;
152 #else
153diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/qcm/qjdns.qcm trunk/iris/qcm/qjdns.qcm
154--- vendor/current/iris/qcm/qjdns.qcm 2014-04-17 19:29:12.000000000 +0200
155+++ trunk/iris/qcm/qjdns.qcm 2014-04-23 10:35:38.000000000 +0200
156@@ -17,8 +17,8 @@
157 QString shortname() const { return "qjdns"; }
158 bool exec()
159 {
160-#if defined Q_OS_WIN || defined Q_OS_MAC
161- // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
162+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
163+ // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
164 conf->addExtra("CONFIG += iris-qjdns");
165 return true;
166 #else
167diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/corelib.pri trunk/iris/src/irisnet/corelib/corelib.pri
168--- vendor/current/iris/src/irisnet/corelib/corelib.pri 2014-04-17 19:29:12.000000000 +0200
169+++ trunk/iris/src/irisnet/corelib/corelib.pri 2014-04-23 10:37:56.000000000 +0200
170@@ -30,6 +30,11 @@
171 $$PWD/netinterface_unix.cpp
172 }
173
174+os2 {
175+ SOURCES += \
176+ $$PWD/netinterface_unix.cpp
177+}
178+
179 windows {
180 SOURCES += \
181 $$PWD/netinterface_win.cpp
182diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/irisnetglobal.cpp trunk/iris/src/irisnet/corelib/irisnetglobal.cpp
183--- vendor/current/iris/src/irisnet/corelib/irisnetglobal.cpp 2012-10-04 02:53:08.000000000 +0200
184+++ trunk/iris/src/irisnet/corelib/irisnetglobal.cpp 2012-10-16 17:42:50.000000000 +0200
185@@ -28,7 +28,7 @@
186 #ifdef Q_OS_WIN
187 extern IrisNetProvider *irisnet_createWinNetProvider();
188 #endif
189-#ifdef Q_OS_UNIX
190+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
191 extern IrisNetProvider *irisnet_createUnixNetProvider();
192 #endif
193 extern IrisNetProvider *irisnet_createJDnsProvider();
194@@ -183,7 +183,7 @@
195 #ifdef Q_OS_WIN
196 addBuiltIn(irisnet_createWinNetProvider());
197 #endif
198-#ifdef Q_OS_UNIX
199+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
200 addBuiltIn(irisnet_createUnixNetProvider());
201 #endif
202 addBuiltIn(irisnet_createJDnsProvider());
203diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/corelib/netinterface_unix.cpp trunk/iris/src/irisnet/corelib/netinterface_unix.cpp
204--- vendor/current/iris/src/irisnet/corelib/netinterface_unix.cpp 2012-10-04 02:53:08.000000000 +0200
205+++ trunk/iris/src/irisnet/corelib/netinterface_unix.cpp 2012-10-18 15:13:40.000000000 +0200
206@@ -97,8 +97,10 @@
207
208 if(((struct sockaddr *)&ifr->ifr_addr)->sa_family == AF_INET) {
209 sockaddr_len = sizeof(struct sockaddr_in);
210+#ifndef Q_OS_OS2
211 } else if(((struct sockaddr *)&ifr->ifr_addr)->sa_family == AF_INET6) {
212 sockaddr_len = sizeof(struct sockaddr_in6);
213+#endif
214 } else {
215 sockaddr_len = sizeof(struct sockaddr);
216 }
217diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/noncore/cutestuff/socks.cpp trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp
218--- vendor/current/iris/src/irisnet/noncore/cutestuff/socks.cpp 2016-04-08 16:55:40.000000000 +0200
219+++ trunk/iris/src/irisnet/noncore/cutestuff/socks.cpp 2016-04-13 14:23:18.000000000 +0200
220@@ -27,7 +27,7 @@
221 #include <QSocketNotifier>
222 #include <QByteArray>
223
224-#ifdef Q_OS_UNIX
225+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
226 #include <sys/types.h>
227 #include <netinet/in.h>
228 #endif
229@@ -36,7 +36,7 @@
230 #include <windows.h>
231 #endif
232
233-#ifdef Q_OS_UNIX
234+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
235 #include <unistd.h>
236 #include <fcntl.h>
237 #endif
238diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/irisnet/noncore/turnclient.cpp trunk/iris/src/irisnet/noncore/turnclient.cpp
239--- vendor/current/iris/src/irisnet/noncore/turnclient.cpp 2013-08-22 16:54:12.000000000 +0200
240+++ trunk/iris/src/irisnet/noncore/turnclient.cpp 2013-08-22 17:49:06.000000000 +0200
241@@ -29,7 +29,11 @@
242 #include "bytestream.h"
243 #include "bsocket.h"
244 #include "httpconnect.h"
245+#ifdef Q_OS_OS2
246+#include "../cutestuff/socks.h"
247+#else
248 #include "socks.h"
249+#endif
250
251 namespace XMPP {
252
253diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/jdns/src/jdns/jdns_p.h trunk/iris/src/jdns/src/jdns/jdns_p.h
254--- vendor/current/iris/src/jdns/src/jdns/jdns_p.h 2014-09-18 16:20:48.000000000 +0200
255+++ trunk/iris/src/jdns/src/jdns/jdns_p.h 2014-09-18 16:20:20.000000000 +0200
256@@ -32,6 +32,8 @@
257
258 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
259 # define JDNS_OS_WIN
260+#elif defined(__OS2__) || defined(OS2) || defined(_OS2)
261+# define JDNS_OS_OS2
262 #else
263 # define JDNS_OS_UNIX
264 #endif
265@@ -52,7 +54,7 @@
266 # include <windows.h>
267 #endif
268
269-#ifdef JDNS_OS_UNIX
270+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
271 # include <unistd.h>
272 # include <netinet/in.h>
273 #endif
274diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/jdns/src/jdns/jdns_sys.c trunk/iris/src/jdns/src/jdns/jdns_sys.c
275--- vendor/current/iris/src/jdns/src/jdns/jdns_sys.c 2015-09-15 16:33:46.000000000 +0200
276+++ trunk/iris/src/jdns/src/jdns/jdns_sys.c 2015-09-15 17:59:32.000000000 +0200
277@@ -117,7 +117,7 @@
278 # include <windows.h>
279 #endif
280
281-#ifdef JDNS_OS_UNIX
282+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
283 # include <netinet/in.h>
284 # include <arpa/nameser.h>
285 # include <resolv.h>
286@@ -632,7 +632,7 @@
287
288 #endif
289
290-#ifdef JDNS_OS_UNIX
291+#if defined(JDNS_OS_UNIX) || defined(JDNS_OS_OS2)
292
293 static jdns_dnsparams_t *dnsparams_get_unixfiles()
294 {
295@@ -644,7 +644,13 @@
296
297 params = jdns_dnsparams_new();
298
299+#ifdef JDNS_OS_OS2
300+ char resolvFile[MAXPATHLEN];
301+ sprintf(resolvFile, "%s/resolv2", getenv("ETC"));
302+ f = jdns_fopen(resolvFile, "r");
303+#else
304 f = jdns_fopen("/etc/resolv.conf", "r");
305+#endif
306 if(!f)
307 return params;
308 while(1)
309@@ -717,8 +723,13 @@
310 return -1;
311 return mac_res_init();
312 #else
313+#ifdef JDNS_OS_OS2 // on os2 we don't care about returncode
314+ res_init();
315+ return 0;
316+#else
317 return res_init();
318 #endif
319+#endif
320 }
321 #endif
322
323@@ -771,6 +782,7 @@
324 jdns_address_delete(addr);
325 }
326 #else
327+#ifndef JDNS_OS_OS2 //no ipv6 on os2
328 // nameservers - ipv6
329 #ifdef __GLIBC__
330 for(n = 0; n < MAXNS; ++n)
331@@ -798,6 +810,7 @@
332 jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT);
333 jdns_address_delete(addr);
334 }
335+#endif
336
337 // nameservers - ipv4
338 #ifdef __GLIBC__
339@@ -866,7 +879,13 @@
340 params = dnsparams_get_unixfiles();
341 }
342
343+#ifdef JDNS_OS_OS2
344+ char hostsFile[MAXPATHLEN];
345+ sprintf(hostsFile, "%s/hosts", getenv("ETC"));
346+ apply_hosts_file(params, hostsFile);
347+#else
348 apply_hosts_file(params, "/etc/hosts");
349+#endif
350
351 return params;
352 }
353diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/jdns/src/qjdns/qjdns_sock.cpp trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp
354--- vendor/current/iris/src/jdns/src/qjdns/qjdns_sock.cpp 2014-04-17 19:29:14.000000000 +0200
355+++ trunk/iris/src/jdns/src/qjdns/qjdns_sock.cpp 2014-04-23 11:19:34.000000000 +0200
356@@ -33,7 +33,7 @@
357 # include <ws2tcpip.h>
358 #endif
359
360-#ifdef Q_OS_UNIX
361+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
362 # include <sys/time.h>
363 # include <sys/types.h>
364 # include <sys/socket.h>
365diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/xmpp/base/timezone.cpp trunk/iris/src/xmpp/base/timezone.cpp
366--- vendor/current/iris/src/xmpp/base/timezone.cpp 2016-04-08 16:55:40.000000000 +0200
367+++ trunk/iris/src/xmpp/base/timezone.cpp 2016-04-13 12:56:58.000000000 +0200
368@@ -22,7 +22,7 @@
369 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
370 #include <QByteArray>
371 #include <QTime>
372-#ifdef Q_OS_UNIX
373+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
374 #include <time.h>
375 #endif
376 #ifdef Q_OS_WIN
377@@ -41,7 +41,7 @@
378
379 static void init()
380 {
381-#if defined(Q_OS_UNIX)
382+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
383 time_t x;
384 time(&x);
385 char str[256];
386diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/xmpp/xmpp-core/connector.cpp trunk/iris/src/xmpp/xmpp-core/connector.cpp
387--- vendor/current/iris/src/xmpp/xmpp-core/connector.cpp 2015-09-15 16:33:46.000000000 +0200
388+++ trunk/iris/src/xmpp/xmpp-core/connector.cpp 2015-09-15 18:10:26.000000000 +0200
389@@ -40,7 +40,11 @@
390 #include "bsocket.h"
391 #include "httpconnect.h"
392 #include "httppoll.h"
393+#ifdef Q_OS_OS2
394+#include "../../irisnet/noncore/cutestuff/socks.h"
395+#else
396 #include "socks.h"
397+#endif
398
399 //#define XMPP_DEBUG
400
401diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/iris/src/xmpp/xmpp-im/s5b.cpp trunk/iris/src/xmpp/xmpp-im/s5b.cpp
402--- vendor/current/iris/src/xmpp/xmpp-im/s5b.cpp 2016-04-08 16:55:40.000000000 +0200
403+++ trunk/iris/src/xmpp/xmpp-im/s5b.cpp 2016-04-13 14:35:54.000000000 +0200
404@@ -28,7 +28,11 @@
405
406 #include "xmpp_xmlcommon.h"
407 #include "im.h"
408+#ifdef Q_OS_OS2
409+#include "../../irisnet/noncore/cutestuff/socks.h"
410+#else
411 #include "socks.h"
412+#endif
413 #include "safedelete.h"
414
415 #ifdef Q_OS_WIN
416diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/os2/app.ico trunk/os2/app.ico
417--- vendor/current/os2/app.ico 1970-01-01 01:00:00.000000000 +0100
418+++ trunk/os2/app.ico 2012-10-18 21:15:20.000000000 +0200
419@@ -0,0 +1,30 @@
420+BA(HCI°
421+
422 ÿÿÿCI0
423
424€€€“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î…
425Yó„FÿŸWß~C¹uHŠN&u9#PÿÔŽÿŸŒÒ›zÒpeãaAóMÿܹ–sPÿÃÿŠҞ{êwhÉn]íkHí†HŽO/¹5(y6
426z4PÿôàÿКÿÖ°å•têŽ_ã‚Wÿ k܂]»`:¯eF‡A3T0
427ÿ؛ÿ»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
428
429 @ÿÿÿCI0
430
431 # ;=>>>??AB C
432+E
433
434F
435
436F
437
438G
439G!I#J$L%O%R&T&V'X'Y'[%]#
440^"
441b"
442e"
443h"
444k"
445n#
446q$
447s't)u)x)|,€.„0‡0‰0Œ-,‘,”+˜+,£-©/¬/²-·+º+Ÿ.¿2Ÿ6»:
448ž=Ž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
4490`ÿÿÿCI0
45000
451
452"
453+&
454*
455-/149>BHMSVZ`$
456+b%
457d'
458h'
459j)
460n*
461o+r-t-v,y)
462|%
463€&
464ƒ&
465‡&
466Š&
467&
468”&
469+—,
470™2›6›9 ;€;š;š7©5«2®/
471°,
472²*
473³*
474µ+
475ž,
476»-
477Ÿ-
478Å-
479Ì/Ò2Ù6Ü8Þ<Þ?Ý@ÜAÛBÚC×DÕEÕF×GÛJ
480Ü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þ…
481Bþ‡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ý±{þ²|þ³{þ±|ý²~üŽüµ…
482ü¶†ý¹†þœ„þŸƒþ¿…
483þÀ†þˆþÊþŌþƍþǐþɒþɓþǔþÁ•þŸ—þœ–þœ—þœ˜þ¿œþÁ þ¡þ¡þâþáþÅ¡ÿÿÿþ˝þ͜þϛþЛþѝþҟþÑ¢þÑ¥þѧþЩþέþΰþϳþ϶þÑ·þÔžþضþÛ³þÞ²þá³þã¶þæŒþçÁþçÆþçÊþèÎþêÑþëÓþï×þðØBA(
484+CI0
485
486 ÿÿÿCI°
487
488BA(h
489+CI°
490 @ÿÿÿCI°!
491 BA(CI°-
4920`ÿÿÿCI°0
49300ÿÿøÿøààääGægâgÂ'Â'ç7ÿ1ÿÿ“ÿ÷8ìg±°9ü£Pî€í²f\ñð¥Ehóò€¢ ŠŠ—§ö™
494+š™p†^onyqš’]mœ‰”iõ“r‘›tk‡Ž•lux…
495 Šjûúø„Œ–‚÷ôƒˆùvwÿÿÿÿÿÿÿÿÿÁÿÿÿÁÿÿÿÀÿÿÿ€ÿþÿþÿüÿüÿø0@ø0`ø80?ü8?ü8?ü<þ
496
497þ
498
499ø
500
501ð
502
503ð
504ð
505ð
506
507ÿþÿÿÿÛÿÿ“ÿÿÿÿ‚'ÿÿ‚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¹Üى
508ŒÞܳ;3.-lÝÜÈL[¯Šº¿zO×ÞÜlAùvä`Çÿÿ«
509\õÀvï‚ÜÙºIr~Aö{QQQQ\õºŠû¥…
510Tÿÿÿÿÿÿÿÿÿÿÿÿÿÿƒÿÿÿÿþÿÿÿÿþÿÿÿÿþÿÿÿÿþÿÿÿÿþ?ÿÿÿøÿÿÿàÿÿÿÀÿÿÿÀ?ÿÿ€ÿÿ€ÿÿÿÿÀ`ÿÿÀ0ÿÿÀ8ÿÿà<ÿÿà>ÿÿà
511ÿÿ€àÿÿ€ðÿÿ€pÿÿÀp€ÿÿÀx€ÿÿÀ8€ÿÿ@8€ÿþ8€ÿþ<€ÿü<€ÿü<€ÿø<€ÿü~€ÿÿþÿÿÿÿþÿÿÿÿÿþÿÿÿÿÌGÿÿÿÈÇÿÿÿØÇÿÿÿ€ðÿÿÿ€áÿÿÿ€cÿÿÿ€fÿÿÿÿø?ÿÿÿÿðÿÿÿÿðÿÿÿÿÿóÿ¶ŸŸŸŸÄ£Óÿÿÿÿÿô!†ü÷öõù÷44ôøõõ÷ùx$Âùôôõúƒ
5124€µéùèèç÷òÉœƒy( ˆçøøõéççæçô÷øø÷ä«5(µ÷õæåååååååååååçô÷ëš4­÷èÒÓÓÒÓÒÓÓÓäÓÓÒÒÒÓë÷Îs}óæÎÐÏÑçëèÐÐÐäëêæÑÏÐÏÑôælÁêÊÍÌÑëÕ·èÑÌÌÓâœÔëäÌÍÌÌéãouãÏÉÉËê«66ÇÓÉÉÌâm4‰ÔèÊÉÊÉèÎ7|äÂÂÂÓŸ,šâÂÂÂä„kÀçÉÂÂÂè®!‡ÑÂÂÂÔ}}ÔÂÂÂϺ
513W»ÔÂÂÂÂÓ{‡Ì¹¹ÂÍuoŹ¹ÂÉ4YÀɳ¹³Ìº(ŽÉ³³¹Éy®Â±³¹Ërdɹ³³¹Ëop±¯¯Â‹ŠÂ¯¯¯Â‰€Â¯¯¯Â§
5146®±¬«¹§!j¹®­¬³š!m¹¯¬«°Ž5”±¡¡¬¯67ª­¢¢­®5Ÿ°¡¢¢³kh­ Ÿ ®iŒ­Ÿ  ­ne­  Ÿ­ŒOžŸœ¡’
515k¢ššš ŽTŸžœ ›(——˜˜3PŸœŸ”%˜™œ›5X©®º²U”×ÈÆÈ®7]˜•”•—R8ªÖ×Ú֎`×ÚÙÚÅTV²¶¢™—U
516‘Ö××Ü€.R»ßÙÙÖaOµÆÃÃŽWV_1*\××ØÜ»7;ŠÞÙÙۖ*8©ÆÃûZŽÄ¥ŽŠÙØÙÜÆSŽßÛÙÜŽ::§ÆÃÀ»\<€ÙØ×ÙÙÙÚÞ×TTÈÞÚßÆR;€ÆÃÀ»\SÃ×Æ×ØÙÙÚìÆNAºìÛÛÚa?€ÆÃû[>[ÃßààÞàìîî–=0’ìÞÜà•,B»íàßÚ_FRŒŒÚìíí֓GYààÜì·@GŽ‘‘‘‘SDEITVTGDEÆíÞìÈI>Šðììà\
517bñîìï”/LÞðíïÃB‰„„µ&ƒŸuCÆúïïÛIʱ&õõÉ÷w0Šúïïïa
518Q~ÿÆÓç(aòñïñŠ0røütxüÄHðýñúÛDŠÿÿ‡Åÿ}Cïþýýûb
519ÚðmiÿÔ@UjjjjJ=9*nùùr*‡ÿüa‡ïÿïVÛû‡BEEøÿðÿðàÀÀÀCÀà€#€‚þÿÿÿã
520 u=๏ùàµiO:3
521ߺÿûÇÅ yQ6"
522vO4ýϚÿݧÿњÿÚ¥ÿã«î¿Œ}V:k1ðŒ†ÿЖëšvû¿‰ýčå§xýϕÿ؛–fDÏtCÿœݞkd%
523ï hÿÃ{D*ÁoCÿÀÿÀT0
524Ê_1ÿ«jޒZA ÖxFÿ»u g@áLÿ»u¹uHd
525 í†HÿžTW'œD ÿ¢Xß~C¥B
526ÿŸWóM%ŠN&ÿµu“R0Mÿ kÿštH
527fó„Fÿ“LK
528y6
529»`:ÿǡӋf,܂]ÿКu9#ã‚Wÿ²|`)‹"
530+êŽ_ÿКÿԮ֋g<ŽO/ÿÖ°¯eF6î…
531YÿŸŒl,Ì+×:
532ãaAíkH•)±'ÿÅ€å•t.p)z4.
533i임ÿŠRW1_B.fK3{Y9%
534Én]ÿôà‡A3X)Ҟ{žrS·•jF%·*êwh¹5(a
535WFқzp;&ˆ
536ÒpeŒG0ÿÁÿÿÿ€ÿÿÿ€ÿÿÿ€ÿÿÿ€ÿþÿüÿüÿøøø?ø ?ø0øøüüøð
537ð
538àà
539àø
540ÿþÿþÿÿÿÿÿÿÿÿÿÿþÿÿþ
541
542Þx/íµ…
543è›èÁ•ôÊ ·Q
544^+ÿÿßÿôÆÿÿÜÝž‹ ¢d6ÿíŸÿâ®ÿí»ó͝E1‰P+Փcÿâ¹ÿÝ©ÿÝšÿàµÛŸq­wM‹U1K$
545 o8óŽ€ÿåµÿäŽÿ×€ÿԝÿӜÿ×£ÿä³ÿè¶ÿä³ÿ͜ʊZY*l4ýǓÿã³ÿΗÿ̑ÿϗÿΖÿΖÿΕÿΕÿϕÿΔÿÕ¡ÿä³ý˗¡\45åžjÿÛ©ÿÇÿŋÿҟÿÑ¡þΜÿňÿǎþЀÿРÿÕ¡ÿnjÿÇÿҜÿÙ¥ºn?ŠA
546ÿȔÿ‡ÿœ€ÿΙîŸkÅd2üœŒÿˆÿ¿‚ÿǓÌsC֍]ÿ͙ÿǎÿŒ}ÿōÿҝ¡Z0³a7ÿȐÿ¶vÿÁ‡òšwl(
547bîkÿÉÿµvÿʐªb>¿`2ÿŸ‰ÿÁ…
548ÿŽtÿÈÿº‚`)×q>ÿŒÿ®lÿÁƒÆzLà}Iÿ¿ƒÿ®nÿ¿Þ’`ên5ÿºƒÿŽuÿ®lÿĈÏ|LÖg5ÿŽyÿšeÿžxÑ}NÂY,ÿ³xÿ¬jÿ±oü©oG
549
550äyFÿž|ÿ©gÿ°oÿ®s]&±I!ü¥iÿ€aÿ©fù˜^=«?úœbÿšfÿ£`ÿ®n†A"Š3þžcÿ©fÿ¡_ÿ²qªX1p$
551ò‡Nÿ¢]ÿ›Uÿ¥b€9
552„*
553ì~Fÿ€aÿ™Uÿ§bÀd8àn;ÿŠbÿ˜Tÿ€aæ~IÕc1ÿžWÿ“KÿTÂ\.ÏZ+ÿ›UÿFÿ˜Oîz?& ×Q#ÿ–Tÿ•Oÿ˜RÿOO
554
555’7ÿGÿHÿ™Rí|@,
556«9ÿ•Vÿ eÿ bÿ‘R\
557 2õ}=ÿŽCÿ‹BÿGv/7ó‚Iÿž‰ÿŒ”ÿŠrl#
558‰#ú‰WÿÆ£ÿÀÿµƒ’7Hån8ÿ¡dÿ‘OÿŽC•:2ƒ)
5592ÅV,ÿ—ÿÀžÿœ‘³J"Ü_1ÿÁ™ÿ¿žÿ—ÉY-
560Ï]1ÿµ‡ÿ®‚ÿ§p¬E
561‰+ÿ—Zßn>çtCÿŒ•ÿœ›ÿşØi< ž9ÿ²†ÿÄ¢ÿÅ¡ë|L/ËR'ÿ°ÿ®‚ÿ¬w·J"7ÎS)ÿ»ÿÀ˜ÿŒ•ÿº˜ÿœ›ÿÊšàpCuý–gÿʪÿÇŠÿmcÖO$ÿ®~ÿ¬‚ÿ©u»I!©"ós>ÿ™ÿÈŠÿɪÿË®ÿÓžÿŜÆH"e
562ãl?ÿÌ«ÿƪÿ¶Œ1áV*ÿŘÿÝÿÀÂK$ Ã)×4æY.ó‰_ø€ù«ˆøžvçY.vÊBÿžÿÈ®ÿÆ£ÐS+Ç:Üa6Ù^6ã_4¥0Ê
563Í
564Ñ#Ñ&Õ ²Ž!þªÿÏ·ÿÍ°õyK8;
565+
566Œ óYÿÖÀÿϺÿŸxnB
567
568Y2
569?%P2Z7
570G+>ØP1ÿÔŸÿÑ¿ÿŸŸŠ)£W-û­iG׊uÝŽ9öĊŸZ¯%ÿêýÕÆÿкÙQ5B
571
572^{6ÿíÌ¥vVV%
573ÿଛkA‰
574þ°—ÿëàÿçØùsI™L5ÿåÂ跏;²{XÿéŒd/‹êgøÉ·õ°û£†”
575+ÐtWӏr=v/ÿêÂ̋_.£
576ÄÆ
577Ä
578+É
579œ84‘E2ÿáÁ÷­‡c}噊ÿãÒè‹q¢!–
580ä]RÄ3*— ÿÿÿÿÿÿÿþÿÿÿÿüÿÿÿÿüÿÿÿÿüÿÿÿÿþÿÿÿøÿÿÿðÿÿÿàÿÿÀ?ÿÿ€ÿÿ€ÿÿÿÿÿÿÿÿ€ÿþÀÿþÀÿþ@ÿÿ@
581ÿÿ`ÿ ÿ€ ÿ€ ÿ€ÿ€þþ€ü€ü€ø€ø
582€ø<€ø<€þ|€ÿÁþÆÿÿþ€ÿÿþ€ÿÿÿÿÿÿÿÿÿ ÿÿÿÿÿÿ@ÿÿÿ@ÿÿÿ€pÿÿÿÿà?ÿÿÿÿàÿÿÿÿáÿ
583'
584
585
586
587
588
589Õt0ò©nè­|ç¬yç¬yç¬zì±~å—YB!
590Èh#ýəÿÿïÿüÙÿüÚÿüÙÿÿéÿÜ«a/
591åŒOÿóÑÿë»ÿçŽÿç³ÿñÄÿ庈I
592LÿÞ°ÿìÂÿâ®ÿã°ÿèžÿïÇše4
593n)ÿµzÿíÆÿÞ©ÿÞªÿà­ÿðÉގT]!1$
594ŽEԀHë£lýÍ¥ÿèÄÿÙ£ÿÙ£ÿØ¡ÿäºÿزùœ‰êªtێX¹h5|<-a) èŠMÿÒ¡ÿéÂÿé¿ÿß³ÿØ¥ÿ՞ÿ՞ÿ՝ÿÖ¡ÿÞ¯ÿåºÿèŸÿéÀÿå»ÿϞóždŸR!3w4üškÿæ¿ÿß³ÿҜÿЗÿЗÿИÿњÿњÿњÿљÿЗÿЗÿЗÿљÿÕ ÿÞ²ÿæ¿ÿשóš^†>
595Z$û¡cÿå¿ÿÕ¢ÿːÿ̔ÿ̔ÿ̒ÿ̓ÿ̒ÿ͕ÿ͕ÿ͕ÿΖÿ̓ÿ̓ÿ̑ÿ˒ÿːÿ͔ÿÙªÿåœÿÁŒ¿_*'
596Ùu:ÿÙ®ÿНÿĉÿǍÿŋÿǏÿÒ¡ÿ׬ÿÒ¢ÿƍÿnjÿƊÿϜÿÖ¬ÿÖšÿўÿȐÿŊÿƌÿŊÿȑÿܱÿОÕo5,j+
597ÿ²zÿÕ§ÿÀƒÿ‡ÿÁ…
598ÿǐÿÖªÿÁþ§qýÍ¢ÿǎÿÁ…
599ÿÀ„ÿʔýË¢úšvÿǖÿשÿΚÿÁ…
600ÿ†ÿÁ…
601ÿÀ„ÿÓ¥ÿ͜Êg1«S&ÿ͜ÿČÿŒÿœ€ÿ¿…
602ÿÓŠûŸf€GŠAÿ¶ƒÿʖÿ»ÿŒ€ÿÁ…
603ÿ˚Óf/•BìˆOÿœÿСÿ¿‚ÿœ€ÿŸÿ»~ÿÑ¡ÿŒšNÓs@ÿϝÿº|ÿ¹{ÿ·yÿɗÿ­x„3g% ø˜`ÿ˙ÿ·zÿ¹{ÿ¹zÿϝà†R 4Ùa)ÿ­zþϟÿ»}ÿž{ÿž{ÿ¹{ÿРÿ£if&
604+–:ãKÿőÿŽtÿ³uÿ¶wÿǔÚuBßt?ÿŒÿ·xÿ³uÿ³sÿČþšrY!
605+à^#ÿ©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ÿŸ…
606Âb4«@én7ÿº„ÿ±qÿªiÿ«iÿ¯nÿŸ‡Íg5É]-ÿŽ{ÿšgÿ¥cÿŠdÿ¶{ç{G%
607+…
608.ðIÿ¶|ÿŠdÿŠeÿŠdÿ·|ìƒN-
609‘3ÿ’Yÿ¶{ÿŠdÿŠeÿ¥cÿµzÿ•\R€?ÿ¢gÿ©hÿ \ÿŸ[ÿ¬mÿ—\e$
610Úa/ÿ­qÿ€bÿ¡^ÿ \ÿ¬kÿ™^d$
611Õ\*ÿ¬pÿ¥cÿ ]ÿŸ]ÿ§fÿ©mA
612v'
613ù…
614KÿšgÿšVÿ›Vÿ \ÿ¥fŠE°Bÿœ_ÿ¢aÿšWÿšWÿ¡]ÿ£dœA
615¢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
616ÿ“Qÿ˜Rÿ“Mÿ’Kÿ›UûDV u"
617Ù_.ÿœWÿ‘Iÿ‘IÿHÿ™Tõu<<ÚO!ý’Rÿ—Pÿ“Lÿ’Lÿ˜SÿMy+|'þ{=ÿ“Jÿ‹Bÿ‹AÿEÿŒF”5ÁF
618ÿ’Oÿ•Rÿ’Mÿ‘Mÿ–Qÿ„Cr$§6ù}@ÿ“KÿFÿŽHÿ‘JÿL;-
619ã\'ÿ”Nÿš[ÿŸeÿšrÿŠkÏS#Ž6þ…
620Kÿœ”ÿžÿµŠÿ¹ŽÿždŠ9]
621+îh/ÿFÿ‡?ÿ†<ÿˆ>ÿŒA¿J
622©7ÿcÿ¿˜ÿŒ–ÿ¿œÿŸ•øs:Ež*îh2ÿŒ’ÿÀžÿœ˜ÿÀœÿŽ‚ÔQ!
623:
624ÞW&ÿ€jÿ€nÿ—ZÿŽJÿ‹@ÑR#V PUý}Dÿ¿–ÿº•ÿ»–ÿÿ‘X‰& ÙJ
625ÿ«yÿáÿ»˜ÿŒ˜ÿŸ“ôm5GÊEÿ£mÿŽŠÿ­€ÿª}ÿ€lá[')(ãS"üg+œ-
626wìf.ÿŒ‘ÿ»–ÿ»—ÿ¡ÿšuŒ=®.
627ÿ’\ÿÄ¢ÿœšÿŒ˜ÿÁžÿˆPy
628³8ÿšbÿ²‡ÿ«}ÿª|ÿ©vé`+5
629dÿs:ÿ³ÿ”[øq7ù‘]ÿŒ˜ÿ»—ÿœ™ÿ¡ÿµˆÓMŒ
630ùq;ÿÝÿÁŸÿœšÿ¡ÿ¡l¯3 µ4ÿ•\ÿ³‰ÿ«~ÿ©{ÿ©uíb,:
631±-
632ÿ‘Xÿœ˜ÿ»—ÿœ•ÿœ˜ÿº˜ÿŒšÿŸ›ÿãÿ»ØQ!:
633+äPÿ¹ŽÿÄŠÿ¿ÿáÿŽ†ÛL
634 ²/ÿ’ZÿŽ‰ÿªÿ©{ÿštïb+?
635ZäNÿ¬~ÿž”ÿµÿ¹”ÿ¹—ÿ»™ÿœ›ÿœÿǪÿŽˆÓDº1
636ÿ¢rÿÉ«ÿÀ¡ÿÁ€ÿÀšøi4L
637+µ.ÿ’ZÿŽŒÿ«ÿ©~ÿ©wïa,>
638+³$
639+õ`&ÿ±ÿáÿÅ¥ÿÅ¥ÿÄŠÿÆ©ÿȬÿÎŽÿÒ³ÿˆP¬%’ÿ€JÿʬÿÀÿ€ÿƧÿ†P„Á0
640ÿšuÿÏ°ÿÅ£ÿáÿÚðd0@º(Ø1åKõ{GüŠyÿ¿›ÿʬÿÍ°ÿΰþŸ˜úƒOÝ7Z„ïZ'ÿÅ£ÿŪÿ€ÿÉ­ÿ¡ož,
641+è9ÿr8ÿ}IÿzFÿzEÿ{BôN
642G
643Ê#Ï#×. à@åO"çS&äN!ß:Ð%…
644
645”
646+Ô7
647ÿ³‡ÿ̲ÿÚÿÈ­ÿžàD(f wqrsvs !Ë
648Ê
649É
650 Ë
651Î
652Ž
653ÿ“aÿÒ»ÿÆ«ÿƬÿǧøb-Y •÷i9ÿÓ¹ÿËŽÿÆ®ÿÍ·ÿ…
654S$
655+ !
656!
657#$
658+eåBÿħÿÑÀÿɲÿκÿŠ}¿$y*
659ëˆIáŽMT!
660+> ߓYíšok8؎Rë¯r“X)Ç ÿš†ÿØÊÿË·ÿ̹ÿ¿£å>7x"ÿÀ‚û©g6
661+r0ÿà¯ÿä²h3%
662úœ„ÿb,™
663þƒ^ÿÜÌþΟþËžÿκûd<e7ÃI[!
664!ÖxDÿÿêñŽ„9f/ÿ̖ÿ՟w?xï\9ÿØÅûÓÅûÍŒýÔÂÿj:ÃV$ÿãÂÿðк\)¹e3ÿðÐÿ¹~M_Ý< þÒ¿ýßÔüÕÈüÚÌÿŒ¢Ï)"]øcÿóÚÿóÛä{C%PüµÿûâÐ~D!gÅ'
665ÿÏ·ÿïãþãÖýäÖÿäÐîa@jmÿœÿÒŽÕ].1#Ûp5ÿùßÿǔ„2
666+›žßO4ÛZBÛV>ÛV>ÛZ@Ý@š
667B
668+©.u-ÏX'ÿæÆÿæÆÅX"*
669³
670ÃŒœœœÄ²sævPÿòÚÿçÒðj5^€
671åfRÿ˶ÿÿøýͶßS+
672˜ü¹­þØÎæu^¿%
673–Œ
674+Ó$Õ
675œ
676\ No newline at end of file
677diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/os2/psi_os2.rc trunk/os2/psi_os2.rc
678--- vendor/current/os2/psi_os2.rc 1970-01-01 01:00:00.000000000 +0100
679+++ trunk/os2/psi_os2.rc 2012-10-18 21:26:14.000000000 +0200
680@@ -0,0 +1 @@
681+ICON 1 DISCARDABLE "../os2/app.ico"
682diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/os2/Readme.OS2 trunk/os2/Readme.OS2
683--- vendor/current/os2/Readme.OS2 1970-01-01 01:00:00.000000000 +0100
684+++ trunk/os2/Readme.OS2 2016-04-13 17:01:32.000000000 +0200
685@@ -0,0 +1,266 @@
686+Psi 0.16-dev for OS/2 and OS/2-based systems
687+--------------------------------------------
688+ This file contains information specific to the OS/2 and OS/2-based systems
689+ version of Psi. Before reading it, please refer to the README file that
690+ contains general information about Psi.
691+
692+
693+0. CONTENTS OF THIS FILE
694+========================
695+ 1. INTRODUCTION
696+ 2. REQUIREMENTS
697+ 3. INSTALLATION
698+ 4. CONFIGURATION DATA
699+ 5. KNOWN PROBLEMS
700+ 6. BUGREPORTS
701+ 7. CREDITS
702+ 8. SUPPORT AND DONATIONS
703+ 9. HISTORY
704+
705+
706+1. INTRODUCTION
707+===============
708+ Welcome to Psi version 0.16-dev for OS/2 and OS/2-based systems.
709+
710+
711+2. REQUIREMENTS
712+===============
713+ The following requirements can be installed either by rpm or by zip files
714+ except Extended System Tray widget which is currently available as zip only.
715+
716+
717+ RPM Installation (preferred):
718+ ============================
719+ klibc
720+ -----
721+ 1. yum install libc
722+
723+ GCC4Core
724+ --------
725+ 1. yum install libgcc1
726+ 2. yum install libssp
727+ 3. yum install libstdc++6 libstdc++
728+ 4. yum install libsupc++6 libsupc++
729+ 5. yum install libgcc-fwd
730+
731+ Qt4 dll
732+ -------
733+ 1. yum install libqt4
734+
735+ Zlib
736+ ----
737+ 1. yum install zlib
738+
739+ openssl 1.0
740+ -----------
741+ 1. yum install openssl
742+
743+ pthread
744+ -------
745+ 1. yum install pthread
746+
747+ aspell
748+ ------
749+ 1. yum install aspell (this also installs the english dictionary)
750+
751+ aspell languages
752+ ----------------
753+ 1. yum install aspell-xx were xx is your language (not all are available)
754+
755+
756+ ZIP Installation:
757+ =================
758+ klibc
759+ -----
760+ 1. Download klibc 0.6.6 or better (see http://svn.netlabs.org/libc for
761+ more information)
762+ 2. Install the files to your libpath eg x:\ecs\dll
763+
764+ GCC4Core
765+ --------
766+ 1. Download GCC4Core 1.2.2 or better from ftp://ftp.netlabs.org/pub/gcc
767+ 2. Install the files to your libpath eg. x:\ecs\dll
768+
769+ Qtcore4
770+ -------
771+ 1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more
772+ information). 'Qt Runtime Libraries and Plugins' is sufficient.
773+ 2. Install the files according to the readme
774+
775+ Zlib
776+ ----
777+ 1. Download zlib from f.i. http://rpm.netlabs.org/release/00/zip/
778+ 2. Unpack and install z.dll to your libpath eg. x:\ecs\dll
779+
780+ openssl 1.0
781+ -----------
782+ 1. Download openssl from f.i. http://rpm.netlabs.org/release/00/zip
783+ 2. Unpack and install the dll to your libpath eg. x:\ecs\dll
784+
785+ pthread
786+ -------
787+ 1. Download pthread from f.i. http://rpm.netlabs.org/release/00/zip
788+ 2. Unpack and install the dll to your libpath eg. x:\ecs\dll
789+
790+ aspell
791+ ------
792+ 1. Download aspell from f.i. http://rpm.netlabs.org/release/00/zip
793+ 2. Unpack and install the dll to your libpath eg. x:\ecs\dll
794+
795+ aspell languages
796+ ----------------
797+ 1. Download aspell-xx from f.i. http://rpm.netlabs.org/release/00/zip
798+ 2. unpack the files to x:\psi_application_dir\aspell
799+ (not all languages are available)
800+
801+ Extended System Tray
802+ --------------------
803+ 1. ExtendedSysTray widget for xCenter/eCenter. Not strictly required
804+ but strongly recommended. Get it from here if you do not have it
805+ installed already - ftp://ftp.netlabs.org/pub/qt4/xsystray/
806+
807+
808+3. INSTALLATION
809+===============
810+ 1. Unzip the Psi archive containing this file to a directory of your
811+ choice and run the Psi executable (psi.exe).
812+
813+ 2. Additionally, you can download a Language Pack for your language using
814+ the following link: http://psi-im.org/download. Copy the language file
815+ (f.i. psi_de.qm) into the directory of psi.exe. You need to restart Psi to
816+ load the language file.
817+
818+ 3. If you want to use the 'PM Default Browser/Mail' setting to open links
819+ within chat windows, make sure that you have the default PM browser and
820+ mail client applications set up correctly. The easiest way to do this is
821+ to use the 'Configure Internet Applications' tool from Hobbes
822+ (http://hobbes.nmsu.edu/pub/os2/apps/misc/configapps1_1_1.zip).
823+
824+ Please refer to the 'Known Problems' section below for additional information
825+ on how to resolve problems you may encounter when running Psi for OS/2.
826+
827+ Upgrading a previous version
828+ ----------------------------
829+ If you are upgrading from a previous version of Psi, please always use a clean
830+ directory to install the new version to avoid possible file conflicts. Psi 0.16-dev
831+ uses a new profile data format. Starting Psi 0.16-dev the first time will migrate
832+ your current Psi settings. If you ever want to import the settings of the
833+ older version afterwards again delete the Psi 0.16-dev configuration data trees and
834+ start Psi again. See section 'Configuration Data' for details.
835+
836+ Please note that installing a new version to a clean directory will not affect
837+ your existing personal configuration data (Psi profiles, account settings,
838+ message history) because it is stored in a separate directory and therefore
839+ will be preserved.
840+
841+
842+4. CONFIGURATION DATA
843+=====================
844+ Psi 0.16-dev stores all configuration files (such as Psi profiles, account settings,
845+ message history, etc.) in subdirectories of your home directory (pointed to by
846+ the HOME environment variable). Path to home directory is usually set in your
847+ config.sys (SET HOME=xxxxx). You can check your current home setting by entering
848+ 'echo %home%' in a command line window. Note that if the HOME variable is
849+ invalid or points to a non-existing location, the .config, .local and .cache
850+ subdirectories will be created in the root directory of the boot drive!
851+
852+ Standard eCS installation sets home to x:\home\default. Psi 0.16-dev configuration
853+ is stored in following directories then -
854+ x:\home\default\.local\share\psi
855+ x:\home\default\.config\psi
856+ x:\home\default\.cache\psi
857+
858+ The paths and parameters to the default PM browser and mail client applications
859+ are taken from the HINI_USER_PROFILE\WPURLDEFAULTSETTINGS registry key (stored
860+ in the X:\OS2\OS2.INI file).
861+
862+
863+5. KNOWN PROBLEMS
864+=================
865+ 1. If you have a single-streamed sound card (a card that cannot play
866+ more than one sound at a time) and experience problems with sound
867+ in Psi (such as 100% CPU load when playing too many sounds
868+ simultaneously), try to add the following line to CONFIG.SYS
869+ (or to the .CMD script that starts Psi):
870+
871+ SET QT_PM_NO_SOUND_SHARE=YES
872+
873+ This will tell the Qt library to open sound devices in the
874+ exclusive mode.
875+
876+ 2. The exit button of the Psi window does not close Psi completely but
877+ minimizes Psi as this is the usual behaviour on other platforms.
878+ Unfortunately Psi is not shown in the Window List. To completely close Psi
879+ right button click (RBC) on the Psi symbol in the Extendeded System Tray
880+ xcenter widget. If you have not installed ExtendedSysTray or in case RBC do
881+ not work (f.i. your profile data is not complete) use TOP or KILL or another
882+ process kill utility to exit psi.exe.
883+
884+
885+6. BUGREPORTS
886+=============
887+ Please create bugreports at http://svn.netlabs.org/qtapps
888+ Only bug reports with a reproducable bug are accepted.
889+
890+
891+7. CREDITS
892+==========
893+ The port was done by Silvan Scherrer aka _diver
894+ Thanks go to Dmitriy Kuminov for all his coding work for eCS
895+ Special thanks of course go to the Psi developers - see
896+ http://psi-im.org/about/
897+
898+
899+8. SUPPORT AND DONATIONS
900+========================
901+ Psi port is based on volunteer work. If you would like to support further
902+ development, you can do so in one of the following ways:
903+ * Donate to the Qt4 project: see qt.netlabs.org for more information
904+ * Contribute to the project: Besides actual development, this also includes
905+ maintaining the documentation and the project web site as well as help for
906+ users.
907+
908+
909+9. HISTORY
910+==========
911+
912+ 2016-04-13
913+ * updated to latest 0.16-dev sources
914+
915+ 2016-01-08
916+ * updated to latest 0.16-dev sources
917+
918+ 2015-09-15
919+ * updated to latest 0.16-dev sources
920+
921+ 2015-02-16
922+ * enabled spellchecker
923+
924+ 2014-09-18
925+ * updated to latest 0.16-dev sources
926+
927+ 2014-04-23 (Happy birthday Jason)
928+ * updated to latest 0.16-dev sources
929+
930+ 2014-02-18
931+ * updated to latest 0.16-dev sources
932+
933+ 2013-12-06
934+ * updated to latest 0.16-dev sources
935+
936+ 2013-08-23
937+ * updated to latest 0.16-dev sources
938+
939+ 2013-02-22
940+ * repacked with iconsets
941+
942+ 2012-10-26
943+ * first official Psi 0.15 port
944+
945+ 2006-09-26
946+ * official Psi 0.10.1 port
947+
948+ For general Psi history see README
949+
950+
951+2012-10-29 Andreas Buchinger
952diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/psi.pro trunk/psi.pro
953--- vendor/current/psi.pro 2016-04-08 16:55:16.000000000 +0200
954+++ trunk/psi.pro 2016-04-13 14:37:06.000000000 +0200
955@@ -5,6 +5,7 @@
956 # configure iris
957 unix:system("echo \"include($$top_srcdir/src/conf_iris.pri)\" > $$top_builddir/iris/conf.pri")
958 windows:system("echo include($$top_srcdir/src/conf_iris.pri) > $$top_builddir\\iris\\conf.pri")
959+os2:system("echo include($$top_srcdir/src/conf_iris.pri) > $$top_builddir/iris/conf.pri")
960
961 sub_iris.subdir = iris
962 sub_src.subdir = src
963diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/qcm/qjdns.qcm trunk/qcm/qjdns.qcm
964--- vendor/current/qcm/qjdns.qcm 2015-09-15 16:33:22.000000000 +0200
965+++ trunk/qcm/qjdns.qcm 2015-09-15 18:17:18.000000000 +0200
966@@ -17,8 +17,8 @@
967 QString shortname() const { return "qjdns"; }
968 bool exec()
969 {
970-#if defined Q_OS_WIN || defined Q_OS_MAC
971- // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
972+#if defined Q_OS_WIN || defined Q_OS_MAC || defined Q_OS_OS2
973+ // HACK: on Windows, OS/2 and Mac OS X, always use psi's bundled qjdns
974 conf->addExtra("CONFIG += iris-qjdns");
975 return true;
976 #else
977diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/aboutdlg.cpp trunk/src/aboutdlg.cpp
978--- vendor/current/src/aboutdlg.cpp 2012-10-04 02:53:02.000000000 +0200
979+++ trunk/src/aboutdlg.cpp 2014-11-19 17:45:00.000000000 +0100
980@@ -24,6 +24,9 @@
981
982 #include "applicationinfo.h"
983 #include "aboutdlg.h"
984+#ifdef Q_OS_OS2
985+#include "systeminfo.h"
986+#endif
987
988 AboutDlg::AboutDlg(QWidget* parent)
989 : QDialog(parent)
990@@ -33,7 +36,11 @@
991
992 setModal(false);
993
994+#ifdef Q_OS_OS2
995+ ui_.lb_name->setText ( QString("<h3><b>%1 v%2 on %3</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()).arg(SystemInfo::instance()->os()) );
996+#else
997 ui_.lb_name->setText ( QString("<h3><b>%1 v%2</b></h3>").arg(ApplicationInfo::name()).arg(ApplicationInfo::version()) );
998+#endif
999
1000 ui_.te_license->setText ( loadText(":/COPYING") );
1001
1002diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/applicationinfo.cpp trunk/src/applicationinfo.cpp
1003--- vendor/current/src/applicationinfo.cpp 2016-05-02 17:20:46.000000000 +0200
1004+++ trunk/src/applicationinfo.cpp 2016-05-02 17:48:50.000000000 +0200
1005@@ -143,7 +143,7 @@
1006 {
1007 #if defined(HAVE_X11)
1008 return PSI_DATADIR;
1009-#elif defined(Q_OS_WIN)
1010+#elif defined(Q_OS_WIN) || defined(Q_OS_OS2)
1011 return qApp->applicationDirPath();
1012 #elif defined(Q_OS_MAC)
1013 // FIXME: Clean this up (remko)
1014@@ -238,7 +238,7 @@
1015 QDir configDir(QDir::homePath() + "/Library/Application Support/" + name());
1016 QDir cacheDir(QDir::homePath() + "/Library/Caches/" + name());
1017 QDir dataDir(configDir);
1018-#elif defined HAVE_X11
1019+#elif defined HAVE_X11 || defined(Q_OS_OS2)
1020 QString XdgConfigHome = QString::fromLocal8Bit(getenv("XDG_CONFIG_HOME"));
1021 QString XdgDataHome = QString::fromLocal8Bit(getenv("XDG_DATA_HOME"));
1022 QString XdgCacheHome = QString::fromLocal8Bit(getenv("XDG_CACHE_HOME"));
1023diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/common.cpp trunk/src/common.cpp
1024--- vendor/current/src/common.cpp 2016-05-02 17:20:46.000000000 +0200
1025+++ trunk/src/common.cpp 2016-05-02 17:54:10.000000000 +0200
1026@@ -285,7 +285,7 @@
1027 return;
1028 }
1029
1030-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
1031+#if defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_OS2)
1032 QSound::play(str);
1033 #else
1034 QString player = PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString();
1035diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/config.h trunk/src/config.h
1036--- vendor/current/src/config.h 1970-01-01 01:00:00.000000000 +0100
1037+++ trunk/src/config.h 2016-04-13 16:30:38.000000000 +0200
1038@@ -0,0 +1,3 @@
1039+#define PSI_LIBDIR "/usr/local/lib/psi"
1040+#define PSI_DATADIR "/usr/local/share/psi"
1041+#define PSI_VERSION "0.16-dev-20160413"
1042diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/homedirmigration.cpp trunk/src/homedirmigration.cpp
1043--- vendor/current/src/homedirmigration.cpp 2016-04-08 16:55:16.000000000 +0200
1044+++ trunk/src/homedirmigration.cpp 2016-04-13 14:55:50.000000000 +0200
1045@@ -165,7 +165,7 @@
1046
1047 QString dstDirName;
1048 QRegExp settingsXp("^/psirc$|^/profiles/\\w*/accounts.xml$|^/profiles/\\w*/accounts.xml.backup$|"
1049- "^/profiles/\\w*/options.xml$|^/profiles/\\w*/options.xml.backup$|^/profiles/\\w*/mucskipautojoin.txt$");
1050+ "^/profiles/\\w*/options.xml$|^/profiles/\\w*/options.xml.backup$|^/profiles/\\w*/config.xml$|^/profiles/\\w*/mucskipautojoin.txt$");
1051
1052 QRegExp cacheXp("^/tmp-contentdownloader/.*$|^/tmp-sounds/.*$|^/tmp-pics/.*$|"
1053 "^/bob/.*|^/avatars/.*$|^/profiles/\\w*/vcard/.*$|^/caps.xml$|^/tune$");
1054@@ -254,6 +254,9 @@
1055 base = QDir::cleanPath(base);
1056
1057 oldHomeDir_.setPath(base + "/PsiData");
1058+#elif defined Q_OS_OS2
1059+ QString base = QDir::homePath();
1060+ oldHomeDir_.setPath(base + "/PsiData");
1061 #endif
1062 return oldHomeDir_.exists();
1063 }
1064diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/globalshortcut/globalshortcut.pri trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri
1065--- vendor/current/src/libpsi/tools/globalshortcut/globalshortcut.pri 2013-12-03 19:04:12.000000000 +0100
1066+++ trunk/src/libpsi/tools/globalshortcut/globalshortcut.pri 2013-12-05 14:05:14.000000000 +0100
1067@@ -16,3 +16,6 @@
1068 HEADERS += \
1069 $$PWD/NDKeyboardLayout.h
1070 }
1071+os2: {
1072+ SOURCES += $$PWD/globalshortcutmanager_pm.cpp
1073+}
1074diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp
1075--- vendor/current/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp 1970-01-01 01:00:00.000000000 +0100
1076+++ trunk/src/libpsi/tools/globalshortcut/globalshortcutmanager_pm.cpp 2012-10-18 15:08:06.000000000 +0200
1077@@ -0,0 +1,63 @@
1078+/*
1079+ * globalshortcutmanager_pm.cpp - PM implementation of global shortcuts
1080+ * Copyright (C) 2003-2006 Justin Karneges, Maciej Niedzielski
1081+ *
1082+ * This program is free software; you can redistribute it and/or
1083+ * modify it under the terms of the GNU General Public License
1084+ * as published by the Free Software Foundation; either version 2
1085+ * of the License, or (at your option) any later version.
1086+ *
1087+ * This program is distributed in the hope that it will be useful,
1088+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
1089+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1090+ * GNU General Public License for more details.
1091+ *
1092+ * You should have received a copy of the GNU General Public License
1093+ * along with this library; if not, write to the Free Software
1094+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1095+ *
1096+ */
1097+
1098+/****** @todo this is heavily needed so do it once */
1099+
1100+#include "globalshortcutmanager.h"
1101+#include "globalshortcuttrigger.h"
1102+
1103+#include <QWidget>
1104+
1105+class GlobalShortcutManager::KeyTrigger::Impl : public QWidget
1106+{
1107+public:
1108+ /**
1109+ * Constructor registers the hotkey.
1110+ */
1111+ Impl(GlobalShortcutManager::KeyTrigger* t, const QKeySequence& ks)
1112+ {
1113+ }
1114+
1115+ /**
1116+ * Destructor unregisters the hotkey.
1117+ */
1118+ ~Impl()
1119+ {
1120+ }
1121+
1122+ /**
1123+ * Triggers triggered() signal when the hotkey is activated.
1124+ */
1125+
1126+private:
1127+
1128+};
1129+
1130+
1131+GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
1132+{
1133+ d = new Impl(this, key);
1134+}
1135+
1136+GlobalShortcutManager::KeyTrigger::~KeyTrigger()
1137+{
1138+ delete d;
1139+ d = 0;
1140+}
1141diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/idle/idle.pri trunk/src/libpsi/tools/idle/idle.pri
1142--- vendor/current/src/libpsi/tools/idle/idle.pri 2012-10-04 02:53:12.000000000 +0200
1143+++ trunk/src/libpsi/tools/idle/idle.pri 2012-10-18 14:31:18.000000000 +0200
1144@@ -11,3 +11,6 @@
1145 mac: {
1146 SOURCES += $$PWD/idle_mac.cpp
1147 }
1148+os2 {
1149+ SOURCES += $$PWD/idle_x11.cpp
1150+}
1151diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/simplecli/simplecli.cpp trunk/src/libpsi/tools/simplecli/simplecli.cpp
1152--- vendor/current/src/libpsi/tools/simplecli/simplecli.cpp 2013-08-22 16:54:16.000000000 +0200
1153+++ trunk/src/libpsi/tools/simplecli/simplecli.cpp 2013-12-05 14:24:28.000000000 +0100
1154@@ -84,7 +84,7 @@
1155 */
1156 QHash<QByteArray, QByteArray> SimpleCli::parse(int argc, char* argv[], const QList<QByteArray>& terminalArgs, int* safeArgc)
1157 {
1158-#ifdef Q_OS_WIN
1159+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1160 const bool winmode = true;
1161 #else
1162 const bool winmode = false;
1163diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/spellchecker/aspellchecker.cpp trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp
1164--- vendor/current/src/libpsi/tools/spellchecker/aspellchecker.cpp 2016-04-08 16:55:40.000000000 +0200
1165+++ trunk/src/libpsi/tools/spellchecker/aspellchecker.cpp 2016-04-13 18:02:48.000000000 +0200
1166@@ -36,10 +36,19 @@
1167 : config_(new_aspell_config())
1168 {
1169 aspell_config_replace(config_, "encoding", "utf-8");
1170-#ifdef Q_OS_WIN
1171+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1172+#if defined(Q_OS_OS2)
1173+ // on os/2 we overwrite the directory only if not in an rpm installed system
1174+ if (!getenv("UNIXROOT"))
1175+ {
1176+#endif
1177 aspell_config_replace(config_, "conf-dir", QDir::homePath().toLocal8Bit().data());
1178 aspell_config_replace(config_, "data-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
1179 aspell_config_replace(config_, "dict-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
1180+#if defined(Q_OS_OS2)
1181+ }
1182+#endif
1183+
1184 #endif
1185 setActiveLanguages(getAllLanguages());
1186 }
1187diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/spellchecker/hunspellchecker.cpp trunk/src/libpsi/tools/spellchecker/hunspellchecker.cpp
1188--- vendor/current/src/libpsi/tools/spellchecker/hunspellchecker.cpp 2016-04-08 16:55:40.000000000 +0200
1189+++ trunk/src/libpsi/tools/spellchecker/hunspellchecker.cpp 2016-04-13 15:19:38.000000000 +0200
1190@@ -67,10 +67,17 @@
1191 #elif defined(Q_OS_MAC)
1192 dictPathSet << QLatin1String("/opt/local/share/myspell"); // MacPorts standard paths
1193 #else
1194+#ifdef O_OS_OS2
1195+ dictPathSet << QLatin1String("/@unixroot/usr/share/myspell")
1196+ << QLatin1String("/@unixroot/usr/share/hunspell")
1197+ << QLatin1String("/@unixroot/usr/local/share/myspell")
1198+ << QLatin1String("/@unixroot/usr/local/share/hunspell")
1199+#else
1200 dictPathSet << QLatin1String("/usr/share/myspell")
1201 << QLatin1String("/usr/share/hunspell")
1202 << QLatin1String("/usr/local/share/myspell")
1203 << QLatin1String("/usr/local/share/hunspell")
1204+#endif
1205 << QString("%1/.local/share/myspell").arg(QDir::home().absolutePath())
1206 << QString("%1/.local/share/hunspell").arg(QDir::home().absolutePath());
1207 #endif
1208diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/libpsi/tools/systemwatch/systemwatch.pri trunk/src/libpsi/tools/systemwatch/systemwatch.pri
1209--- vendor/current/src/libpsi/tools/systemwatch/systemwatch.pri 2012-10-04 02:53:12.000000000 +0200
1210+++ trunk/src/libpsi/tools/systemwatch/systemwatch.pri 2013-08-23 10:33:04.000000000 +0200
1211@@ -14,3 +14,7 @@
1212 HEADERS += $$PWD/systemwatch_mac.h
1213 SOURCES += $$PWD/systemwatch_mac.cpp
1214 }
1215+os2 {
1216+ HEADERS += $$PWD/systemwatch_unix.h
1217+ SOURCES += $$PWD/systemwatch_unix.cpp
1218+}
1219diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/main.cpp trunk/src/main.cpp
1220--- vendor/current/src/main.cpp 2016-04-08 16:55:16.000000000 +0200
1221+++ trunk/src/main.cpp 2016-04-13 15:22:48.000000000 +0200
1222@@ -486,7 +486,7 @@
1223 QByteArray val = qgetenv("QT_PLUGIN_PATH");
1224 if(!val.isEmpty())
1225 {
1226-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
1227+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
1228 QLatin1Char pathSep(';');
1229 #else
1230 QLatin1Char pathSep(':');
1231diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/options/opt_sound.cpp trunk/src/options/opt_sound.cpp
1232--- vendor/current/src/options/opt_sound.cpp 2013-08-22 16:52:32.000000000 +0200
1233+++ trunk/src/options/opt_sound.cpp 2016-04-13 15:38:16.000000000 +0200
1234@@ -170,6 +170,8 @@
1235 d->le_player->setText(tr("Windows Sound"));
1236 #elif defined(Q_OS_MAC)
1237 d->le_player->setText(tr("Mac OS Sound"));
1238+#elif defined(Q_OS_OS2)
1239+ d->le_player->setText(tr("OS/2 and OS/2-based systems Sound"));
1240 #else
1241 d->le_player->setText( PsiOptions::instance()->getOption("options.ui.notifications.sounds.unix-sound-player").toString() );
1242 #endif
1243diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/src.pri trunk/src/src.pri
1244--- vendor/current/src/src.pri 2016-05-02 17:20:46.000000000 +0200
1245+++ trunk/src/src.pri 2016-05-02 18:22:04.000000000 +0200
1246@@ -635,6 +635,10 @@
1247 SOURCES += $$PWD/activeprofiles_stub.cpp
1248 }
1249
1250+os2 {
1251+ SOURCES += $$PWD/activeprofiles_stub.cpp
1252+}
1253+
1254 webkit {
1255 HEADERS += $$PWD/chatview_webkit.h \
1256 $$PWD/networkaccessmanager.h \
1257diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/src.pro trunk/src/src.pro
1258--- vendor/current/src/src.pro 2016-04-08 16:55:18.000000000 +0200
1259+++ trunk/src/src.pro 2016-04-13 15:54:12.000000000 +0200
1260@@ -153,6 +153,9 @@
1261 # buggy MSVC workaround
1262 win32-msvc|win32-msvc.net|win32-msvc2005: QMAKE_LFLAGS += /FORCE:MULTIPLE
1263 }
1264+os2 {
1265+ RC_FILE = ../os2/psi_os2.rc
1266+}
1267 mac {
1268 # Universal binaries
1269 qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,x86_64) {
1270diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/systeminfo.cpp trunk/src/systeminfo.cpp
1271--- vendor/current/src/systeminfo.cpp 2016-04-08 16:55:18.000000000 +0200
1272+++ trunk/src/systeminfo.cpp 2016-04-13 16:05:58.000000000 +0200
1273@@ -172,7 +172,6 @@
1274 {
1275 // Initialize
1276 os_str_ = "Unknown";
1277- os_name_str_ = os_str_;
1278
1279 // Detect
1280 #if defined(HAVE_X11)
1281@@ -236,6 +235,56 @@
1282 os_str_ = "Mac OS X";
1283 } else {
1284 os_str_ = os_name_str_ + " " + os_version_str_;
1285+#elif defined(Q_OS_OS2)
1286+ QSysInfo::Os2Version v = QSysInfo::os2Version();
1287+ switch(v) {
1288+ case QSysInfo::OV_Unknown:
1289+ os_str_ = "Unknown";
1290+ break;
1291+ case QSysInfo::OV_2_0:
1292+ os_str_ = "OS/2 2.0";
1293+ break;
1294+ case QSysInfo::OV_2_1:
1295+ os_str_ = "OS/2 2.1";
1296+ break;
1297+ case QSysInfo::OV_2_11:
1298+ os_str_ = "OS/2 2.11";
1299+ break;
1300+ case QSysInfo::OV_3_0:
1301+ os_str_ = "OS/2 Warp 3";
1302+ break;
1303+ case QSysInfo::OV_4_0:
1304+ os_str_ = "OS/2 Warp 4";
1305+ break;
1306+ case QSysInfo::OV_4_5:
1307+ os_str_ = "OS/2 Warp 4.5";
1308+ break;
1309+ case QSysInfo::OV_4_52:
1310+ os_str_ = "OS/2 Warp 4.52";
1311+ break;
1312+ case QSysInfo::OV_ECS_Unknown:
1313+ os_str_ = "eComStation";
1314+ break;
1315+ case QSysInfo::OV_ECS_1_0:
1316+ os_str_ = "eComStation 1.0";
1317+ break;
1318+ case QSysInfo::OV_ECS_1_1:
1319+ os_str_ = "eComStation 1.1";
1320+ break;
1321+ case QSysInfo::OV_ECS_1_2:
1322+ os_str_ = "eComStation 1.2";
1323+ break;
1324+ case QSysInfo::OV_ECS_2_0:
1325+ os_str_ = "eComStation 2.0";
1326+ break;
1327+ case QSysInfo::OV_ECS_2_1:
1328+ os_str_ = "eComStation 2.1";
1329+ break;
1330+ case QSysInfo::OV_ECS_2_2:
1331+ os_str_ = "eComStation 2.2";
1332+ break;
1333+ default:
1334+ os_str_ = "OS/2-based system";
1335 }
1336 #endif
1337
1338diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/textutil.cpp trunk/src/textutil.cpp
1339--- vendor/current/src/textutil.cpp 2014-02-18 11:42:48.000000000 +0100
1340+++ trunk/src/textutil.cpp 2014-02-18 12:22:34.000000000 +0100
1341@@ -87,7 +87,7 @@
1342 int col = 0;
1343
1344 for(int i = 0; i < (int)plain.length(); ++i) {
1345-#ifdef Q_OS_WIN
1346+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
1347 if(plain[i] == '\r' && i+1 < (int)plain.length() && plain[i+1] == '\n')
1348 ++i; // Qt/Win sees \r\n as two new line chars
1349 #endif
1350diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/webview.cpp trunk/src/webview.cpp
1351--- vendor/current/src/webview.cpp 2016-04-08 16:55:18.000000000 +0200
1352+++ trunk/src/webview.cpp 2016-04-13 16:13:32.000000000 +0200
1353@@ -146,7 +146,11 @@
1354 QDrag *drag = new QDrag(this);
1355 QMimeData *mimeData = new QMimeData;
1356
1357+#ifdef __OS2__ // remove with qt 4.8 or better
1358+ QString html = selectedHtml();
1359+#else
1360 QString html = TextUtil::img2title(selectedHtml());
1361+#endif
1362 mimeData->setHtml(html);
1363 mimeData->setText(TextUtil::rich2plain(html));
1364
1365@@ -157,7 +161,11 @@
1366 void WebView::convertClipboardHtmlImages(QClipboard::Mode mode)
1367 {
1368 QClipboard *cb = QApplication::clipboard();
1369+#ifdef __OS2__ // remove with qt 4.8 or better
1370+ QString html = TextUtil::img2title(cb->mimeData(mode)->html());
1371+#else
1372 QString html = TextUtil::img2title(selectedHtml());
1373+#endif
1374 QMimeData *data = new QMimeData;
1375 data->setHtml(html);
1376 data->setText(TextUtil::rich2plain(html, false));
1377@@ -170,6 +178,22 @@
1378 page()->mainFrame()->evaluateJavaScript(scriptSource);
1379 }
1380
1381+#ifdef Q_OS_OS2
1382+QString WebView::selectedHtml()
1383+{
1384+ // WARNING: this hack needs to be removed when we have Qt 4.8
1385+ QClipboard *clipboard = QApplication::clipboard();
1386+ QMimeData *originalData = new QMimeData;
1387+ foreach (QString format, clipboard->mimeData(QClipboard::Clipboard)->formats()) {
1388+ originalData->setData(format, clipboard->mimeData(QClipboard::Clipboard)->data(format));
1389+ }
1390+ copySelected();
1391+ QString html = clipboard->mimeData()->html();
1392+ clipboard->setMimeData(originalData);
1393+ return html;
1394+}
1395+#endif
1396+
1397 QString WebView::selectedText()
1398 {
1399 return TextUtil::rich2plain(TextUtil::img2title(selectedHtml()));
1400diff -Naur -x Makefile -x Makefile.initvars -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 -x conf.log -x .qmake.cache -x build.sh -x '*.pem' vendor/current/src/webview.h trunk/src/webview.h
1401--- vendor/current/src/webview.h 2015-09-15 16:33:22.000000000 +0200
1402+++ trunk/src/webview.h 2015-09-15 18:39:18.000000000 +0200
1403@@ -78,6 +78,9 @@
1404 /** Evaluates JavaScript code */
1405 void evaluateJS(const QString &scriptSource = "");
1406
1407+#ifdef Q_OS_OS2
1408+ QString selectedHtml();
1409+#endif
1410 QString selectedText();
1411 bool isLoading() { return isLoading_; }
1412
Note: See TracBrowser for help on using the repository browser.