source: diffs/psi_0.15.diff@ 189

Last change on this file since 189 was 144, checked in by Silvan Scherrer, 12 years ago

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