source: diffs/psi_0.16.diff@ 153

Last change on this file since 153 was 153, checked in by Silvan Scherrer, 11 years ago

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