source: diffs/psi_0.16.diff@ 186

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

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