DELTA 226289 64 344 SVNd EBW/--- msn/util.cpp.orig 2009-07-22 19:57:10.000000000 +0000 +++ msn/util.cpp @@ -25,11 +25,12 @@ #include #include #include +#include #include #include "libsiren/siren7.h" @@ -367,10 +368,11 @@ namespace MSNENDREP id: 5-226289.0.r328301/320 type: file pred: 5-226289.0.r300897/20706441 count: 2 text: 328301 0 293 740 67ac10456950f3274dd08218ac309668 419a9d9dd333e5fd682d877bc97125012c0365ab 328300-71bq/_5 props: 300897 20706395 33 0 d2b74571aba906f64dadd6584b7cea1d cpath: /head/net-im/libmsn/files/patch-msn__util.cpp copyroot: 0 / PLAIN K 19 patch-msn__util.cpp V 27 file 5-226289.0.r328301/320 END ENDREP id: 6-224919.0.r328301/717 type: dir pred: 6-224919.0.r300897/20706844 count: 7 text: 328301 642 62 62 fc3a2541f20f5161cfacf99c2ac6528c cpath: /head/net-im/libmsn/files copyroot: 0 / PLAIN K 8 Makefile V 29 file k-128127.0.r327756/79788 K 8 distinfo V 32 file n-128127.0.r300897/20705731 K 5 files V 26 dir 6-224919.0.r328301/717 K 9 pkg-descr V 32 file t-128127.0.r300897/20706085 K 9 pkg-plist V 32 file v-128127.0.r300897/20707079 END ENDREP id: i-128127.0.r328301/1163 type: dir pred: i-128127.0.r327756/80366 count: 32 text: 328301 901 249 249 25603459c5a8626faecaa1f7b1d9bf61 cpath: /head/net-im/libmsn copyroot: 0 / PLAIN K 8 Makefile V 30 file 3-147571.0.r327751/333558 K 4 amsn V 27 dir o-74429.0.r327756/36154 K 9 ari-yahoo V 27 dir t-36036.0.r327756/36850 K 5 ayttm V 27 dir z-26491.0.r327756/37607 K 7 bsflite V 28 dir k-136881.0.r327756/38264 K 9 centericq V 27 dir o-24090.0.r327756/39022 K 8 centerim V 28 dir 4-190323.0.r327756/39738 K 14 centerim-devel V 28 dir e-190323.0.r327756/40460 K 13 chattahoochie V 28 dir 4-254245.0.r327756/41175 K 7 cicquin V 28 dir e-110806.0.r327756/41893 K 3 cjc V 28 dir 4-161704.0.r327756/42607 K 5 climm V 27 dir j-11568.0.r327756/43310 K 10 coccinella V 28 dir e-124195.0.r327756/44024 K 6 convey V 28 dir i-140659.0.r327756/44788 K 7 decibel V 28 dir 4-207000.0.r327756/45547 K 5 echat V 27 dir e-87938.0.r327756/46253 K 8 ejabberd V 28 dir w-116657.0.r327756/47063 K 5 ekiga V 34 dir 4-246599.2-327751.r327752/2109 K 7 emesene V 28 dir 4-194509.0.r327756/47778 K 7 empathy V 28 dir 4-209656.0.r327756/48537 K 9 farsight2 V 28 dir 4-229206.0.r327756/49297 K 5 finch V 28 dir 4-175283.0.r327756/49953 K 5 folks V 29 dir ge-264837.0.r327756/50666 K 7 folks04 V 36 dir ge-264837.2-313633.r327756/51444 K 8 freetalk V 28 dir 4-236485.0.r327756/52200 K 4 fugu V 27 dir g-34321.0.r327756/52908 K 5 gajim V 28 dir o-134439.0.r327756/53647 K 4 gale V 27 dir m-31523.0.r327756/54451 K 5 gloox V 28 dir 4-160646.0.r327756/55154 K 8 gtkyahoo V 27 dir f-21036.0.r327756/55904 K 5 gyach V 27 dir e-96596.0.r327756/56658 K 5 hotot V 28 dir 4-306666.0.r327756/57397 K 3 icb V 28 dir 16-11144.0.r327756/58093 K 8 icmpchat V 27 dir g-69075.0.r327756/58801 K 6 icqlib V 27 dir r-18499.0.r327756/59513 K 9 imspector V 28 dir 4-209345.0.r327756/60269 K 8 iserverd V 28 dir 4-198971.0.r327756/61086 K 6 jabber V 28 dir 17-28216.0.r327756/61846 K 12 jabber-pyaim V 28 dir 4-166985.0.r327756/62608 K 12 jabber-pyicq V 28 dir m-136996.0.r327756/63378 K 12 jabber-pymsn V 28 dir k-131599.0.r327756/64147 K 9 jabber.el V 28 dir 4-163540.0.r327756/64867 K 7 jabberd V 27 dir i-96879.0.r327756/65609 K 4 jarl V 27 dir k-69814.0.r327756/66356 K 8 jggtrans V 28 dir 4-171767.0.r327756/67165 K 5 jitsi V 28 dir 4-315152.0.r327756/67953 K 13 kde-telepathy V 28 dir 4-317156.0.r327756/68555 K 10 kmess-kde4 V 28 dir 11-61785.0.r327756/69309 K 8 komclean V 28 dir 4-256958.0.r327756/70023 K 11 kopete-kde4 V 29 dir iy-311483.0.r327756/70741 K 16 ktp-accounts-kcm V 28 dir 4-317154.0.r327756/71461 K 12 ktp-approver V 28 dir f-317154.0.r327756/72179 K 16 ktp-auth-handler V 28 dir p-317154.0.r327756/72897 K 20 ktp-common-internals V 28 dir z-317154.0.r327756/73675 K 16 ktp-contact-list V 29 dir 1d-317154.0.r327756/74407 K 18 ktp-contact-runner V 29 dir 1n-317154.0.r327756/75139 K 24 ktp-filetransfer-handler V 29 dir 1x-317154.0.r327756/75879 K 27 ktp-kded-integration-module V 29 dir 27-317154.0.r327756/76628 K 13 ktp-send-file V 29 dir 2h-317154.0.r327756/77366 K 11 ktp-text-ui V 29 dir 2r-317154.0.r327756/78133 K 9 libjingle V 28 dir 4-156732.0.r327756/78901 K 8 libjreen V 28 dir 2-299961.0.r327756/79603 K 6 libmsn V 27 dir i-128127.0.r328301/1163 K 7 libnice V 28 dir 4-229205.0.r327756/81079 K 9 libpurple V 29 dir 18-175283.0.r327756/81836 K 12 libtelepathy V 28 dir 4-190154.0.r327756/82561 K 9 libyahoo2 V 27 dir i-78385.0.r327756/83323 K 4 licq V 28 dir z-11803.0.r327804/790765 K 8 licq-icq V 28 dir a-325717.0.r327756/84775 K 11 licq-jabber V 29 dir 4-304375.0.r327804/791371 K 8 licq-msn V 29 dir i-325717.0.r327804/791981 K 8 licq-osd V 28 dir k-85638.0.r327804/792693 K 11 licq-qt-gui V 28 dir x-41226.0.r327804/793414 K 8 linpopup V 27 dir s-35967.0.r327756/88219 K 16 linux-ymessenger V 27 dir i-96591.0.r327756/88977 K 9 loudmouth V 27 dir i-84453.0.r327756/89735 K 8 mbpurple V 28 dir 4-257241.0.r327756/90496 K 7 mcabber V 28 dir i-144303.0.r327756/91213 K 9 meanwhile V 28 dir e-112175.0.r327756/91980 K 7 mercury V 28 dir i-134453.0.r327756/92745 K 8 mikutter V 28 dir 4-282484.0.r327756/93483 K 9 msn-proxy V 28 dir 4-205992.0.r327756/94246 K 13 mu-conference V 28 dir i-129182.0.r327756/95016 K 4 naim V 27 dir h-17761.0.r327756/95721 K 8 openfire V 28 dir 4-177379.0.r327756/96515 K 14 openfire-devel V 28 dir 4-268163.0.r327756/97335 K 16 p5-AnyEvent-XMPP V 28 dir 4-239807.0.r327756/98052 K 11 p5-DJabberd V 28 dir 4-186189.0.r327756/98780 K 20 p5-Jabber-Connection V 27 dir e-90021.0.r327756/99504 K 14 p5-Jabber-Lite V 29 dir 4-199811.0.r327756/100232 K 20 p5-Jabber-SimpleSend V 29 dir 4-171207.0.r327756/100967 K 10 p5-Net-AIM V 28 dir g-73472.0.r327756/101695 K 12 p5-Net-AOLIM V 28 dir g-61810.0.r327756/102414 K 17 p5-Net-Async-XMPP V 29 dir 4-270451.0.r327756/103147 K 14 p5-Net-ICQ2000 V 28 dir g-51114.0.r327756/103874 K 13 p5-Net-Jabber V 28 dir g-35957.0.r327756/104598 K 10 p5-Net-MSN V 29 dir e-115198.0.r327756/105323 K 14 p5-Net-NetSend V 29 dir e-146251.0.r327756/106048 K 12 p5-Net-OSCAR V 29 dir e-118958.0.r327756/106773 K 12 p5-Net-Stomp V 29 dir 4-184911.0.r327756/107504 K 11 p5-Net-XMPP V 29 dir e-123381.0.r327756/108234 K 12 p5-Net-XMPP2 V 29 dir 4-213845.0.r327756/108962 K 27 p5-POE-Component-Client-MSN V 29 dir 4-188001.0.r327756/109705 K 16 p5-Protocol-XMPP V 29 dir 4-270450.0.r327756/110455 K 24 p5-SOAP-Transport-JABBER V 29 dir 4-280194.0.r327756/111198 K 6 papyon V 29 dir 4-190390.0.r327756/111983 K 6 pebrot V 29 dir e-105292.0.r327756/112751 K 10 pecl-stomp V 29 dir 4-245048.0.r327756/113409 K 6 pidgin V 30 dir 1i-175283.0.r327756/114080 K 23 pidgin-audacious-remote V 29 dir 4-282788.0.r327756/114860 K 24 pidgin-birthday-reminder V 29 dir 4-232557.0.r327756/115608 K 9 pidgin-bs V 29 dir 4-251104.0.r327756/116340 K 19 pidgin-facebookchat V 29 dir 4-217645.0.r327756/117024 K 13 pidgin-fetion V 29 dir 4-221806.0.r327756/117763 K 19 pidgin-guifications V 29 dir p-108466.0.r327756/118498 K 14 pidgin-hotkeys V 29 dir c-177914.0.r328166/347987 K 12 pidgin-latex V 29 dir l-137916.0.r327756/119859 K 16 pidgin-libnotify V 29 dir 4-195685.0.r327756/120641 K 17 pidgin-manualsize V 29 dir 4-212599.0.r327756/121327 K 16 pidgin-msn-pecan V 29 dir 4-218102.0.r327756/122113 K 10 pidgin-osd V 29 dir 4-246174.0.r327756/122790 K 15 pidgin-pidgimpd V 29 dir 4-220870.0.r327756/123465 K 21 pidgin-privacy-please V 29 dir 4-260382.0.r327756/124254 K 16 pidgin-rhythmbox V 29 dir 4-194537.0.r327756/124991 K 11 pidgin-sipe V 29 dir 4-234099.0.r327756/125769 K 12 pidgin-skype V 29 dir 4-266650.0.r327756/126483 K 14 pidgin-twitter V 29 dir 4-213228.0.r327756/127158 K 17 plasma-applet-ktp V 30 dir 37-317154.0.r327756/127888 K 4 pork V 28 dir e-77870.0.r327756/128611 K 7 prosody V 29 dir 4-237759.0.r327756/129376 K 3 psi V 28 dir k-58451.0.r327756/130126 K 8 psimedia V 29 dir 2-265338.0.r327756/130888 K 7 pwytter V 29 dir 4-255074.0.r327756/131604 K 9 py-jabber V 28 dir g-53011.0.r327756/132321 K 12 py-jabberbot V 29 dir 4-252353.0.r327756/132986 K 7 py-msnp V 28 dir e-96608.0.r327888/726719 K 9 py-punjab V 29 dir 4-207227.0.r327756/134455 K 9 py-pyxmpp V 29 dir i-130373.0.r327756/135179 K 15 py-twistedWords V 29 dir e-133380.0.r327756/135898 K 9 py-xmpppy V 29 dir 4-160811.0.r327756/136673 K 13 py-xmpppy-irc V 29 dir e-160811.0.r327756/137394 K 15 py-xmpppy-yahoo V 29 dir 4-196370.0.r327756/138118 K 5 pymsn V 29 dir e-190390.0.r327756/138840 K 2 qq V 29 dir 4-234063.0.r327756/139600 K 5 qutim V 29 dir 4-214964.0.r327756/140315 K 4 qwit V 29 dir 4-230053.0.r327756/140980 K 10 qwit-devel V 29 dir c-230053.0.r327756/141650 K 5 qxmpp V 29 dir 4-288975.0.r327756/142418 K 16 qxmpp-leechcraft V 29 dir 4-303357.0.r327756/143169 K 15 ramblercontacts V 29 dir 4-277221.0.r327756/143906 K 18 rubygem-earthquake V 29 dir 4-297965.0.r327756/144577 K 15 rubygem-hipchat V 29 dir 4-320785.0.r327756/145246 K 16 rubygem-termtter V 29 dir 4-237636.0.r327756/145923 K 14 rubygem-xmpp4r V 29 dir e-149091.0.r327756/146603 K 8 sendxmpp V 29 dir 4-154407.0.r327756/147274 K 5 skype V 29 dir o-112033.0.r327756/148088 K 11 skype-devel V 29 dir e-202474.0.r327756/148911 K 10 tapioca-qt V 29 dir 4-206998.0.r327756/149678 K 19 telepathy-butterfly V 29 dir 4-190394.0.r327756/150460 K 18 telepathy-farsight V 29 dir 4-229207.0.r327756/151203 K 16 telepathy-gabble V 29 dir 4-190375.0.r327756/151987 K 14 telepathy-glib V 29 dir 4-190373.0.r327756/152718 K 14 telepathy-haze V 29 dir 4-209657.0.r327756/153449 K 14 telepathy-idle V 29 dir 4-190388.0.r327756/154183 K 16 telepathy-logger V 30 dir h5-264837.0.r327756/154970 K 20 telepathy-logger-qt4 V 29 dir 4-317152.0.r327756/155697 K 25 telepathy-mission-control V 29 dir 4-209658.0.r327756/156443 K 16 telepathy-python V 29 dir 4-190392.0.r327756/157191 K 12 telepathy-qt V 29 dir 4-206996.0.r327756/157923 K 13 telepathy-qt4 V 29 dir 4-247968.0.r327756/158637 K 15 telepathy-salut V 29 dir 4-190378.0.r327756/159414 K 18 telepathy-sofiasip V 29 dir 4-318078.0.r327756/160131 K 7 tkabber V 29 dir 10-93955.0.r327756/160908 K 13 tkabber-devel V 29 dir 1h-93955.0.r327756/161681 K 15 tkabber-plugins V 29 dir 4-202175.0.r327756/162463 K 7 tkabbur V 29 dir 4-221763.0.r327756/163241 K 5 tmsnc V 29 dir i-143057.0.r327756/163953 K 7 ttytter V 29 dir 4-230666.0.r327756/164608 K 7 turpial V 29 dir s-276360.0.r327756/165378 K 7 twirssi V 29 dir 4-243896.0.r327756/166086 K 8 twitmail V 29 dir 4-249815.0.r327756/166800 K 9 vacuum-im V 29 dir 4-253973.0.r327756/167506 K 4 vicq V 28 dir g-51116.0.r327756/168264 K 8 vqcc-gtk V 29 dir e-130726.0.r327756/169027 K 22 xfce4-messenger-plugin V 29 dir 4-182997.0.r327756/169762 K 5 yoono V 29 dir 4-318431.0.r327756/170518 K 3 ysm V 28 dir q-60173.0.r327756/171218 K 6 zephyr V 29 dir 4-260493.0.r327756/171975 END ENDREP id: 15-11144.0.r328301/10913 type: dir pred: 15-11144.0.r328166/357752 count: 3800 text: 328301 1342 9558 9558 ec9cf171499e83c03af553507296f258 cpath: /head/net-im copyroot: 0 / PLAIN K 7 CHANGES V 26 file 1-99373.0.r328139/536 K 9 COPYRIGHT V 26 file 1-146787.0.r309727/49 K 4 GIDs V 27 file 1-168311.0.r327064/383 K 5 KNOBS V 27 file 1-147337.0.r328005/126 K 8 Keywords V 28 dir 1-314142.0.r314142/35921 K 5 LEGAL V 25 file 1-748.0.r325483/2440 K 5 MOVED V 26 file 1-69878.0.r328159/377 K 8 Makefile V 22 file 1-6.0.r318556/629 K 2 Mk V 22 dir 1-5.0.r328289/3168 K 6 README V 29 file 1-2408.0.r300895/4775053 K 9 Templates V 24 dir 1-2932.0.r326136/838 K 5 Tools V 26 dir 3-15302.0.r327787/3356 K 4 UIDs V 27 file 4-168311.0.r327064/666 K 8 UPDATING V 28 file 1-102685.0.r327844/9451 K 13 accessibility V 26 dir 1-42583.0.r327768/3604 K 6 arabic V 26 dir 1-38973.0.r328297/4303 K 9 archivers V 25 dir 1-242.0.r328287/11578 K 5 astro V 24 dir 1-301.0.r328250/7459 K 5 audio V 25 dir 1-148.0.r328251/46632 K 10 benchmarks V 24 dir 1-62.0.r328226/88384 K 7 biology V 26 dir 1-9066.0.r328226/94324 K 3 cad V 24 dir 1-276.0.r328255/6830 K 7 chinese V 27 dir 1-3770.0.r328226/109271 K 5 comms V 25 dir 1-76.0.r328226/118524 K 10 converters V 25 dir 1-1561.0.r328282/9130 K 9 databases V 25 dir 1-771.0.r328265/51882 K 9 deskutils V 26 dir 1-2098.0.r328259/15194 K 5 devel V 25 dir 1-73.0.r328296/246590 K 3 dns V 26 dir 1-6145.0.r328293/10882 K 7 editors V 24 dir 4-6.0.r328226/482530 K 9 emulators V 25 dir 1-181.0.r328045/18543 K 7 finance V 27 dir 1-4110.0.r328226/493231 K 6 french V 26 dir 1-25673.0.r328067/2534 K 3 ftp V 24 dir 1-199.0.r328269/6093 K 5 games V 25 dir 1-104.0.r328299/57672 K 6 german V 25 dir 1-7451.0.r328191/5674 K 8 graphics V 24 dir 1-94.0.r328298/56723 K 6 hebrew V 26 dir 3-31142.0.r327734/8068 K 9 hungarian V 28 dir 1p-38973.0.r327735/11057 K 3 irc V 24 dir 1-42.0.r328227/10126 K 8 japanese V 26 dir 1-410.0.r328226/645800 K 4 java V 26 dir 1-2798.0.r327845/11538 K 6 korean V 27 dir 1-5873.0.r328096/379013 K 4 lang V 25 dir 1-15.0.r328226/667137 K 4 mail V 25 dir 1-57.0.r328226/709900 K 4 math V 26 dir 1-162.0.r328226/747891 K 4 misc V 24 dir 7-35.0.r328285/26821 K 10 multimedia V 25 dir d-333.0.r328300/22460 K 3 net V 24 dir 1-22.0.r328228/67346 K 6 net-im V 28 dir 15-11144.0.r328301/10913 K 8 net-mgmt V 26 dir r-1011.0.r328283/19838 K 7 net-p2p V 26 dir g-29106.0.r328109/6371 K 4 news V 24 dir 1-145.0.r328030/6155 K 4 palm V 26 dir 1-6646.0.r327760/29240 K 6 polish V 29 dir tv-38973.0.r328096/439634 K 10 ports-mgmt V 26 dir 1-5132.0.r328290/14004 K 10 portuguese V 27 dir 1-17842.0.r327763/15148 K 5 print V 24 dir 1-79.0.r328212/17589 K 7 russian V 25 dir 1-1559.0.r327884/6156 K 7 science V 27 dir n-5356.0.r328226/891450 K 8 security V 26 dir 1-269.0.r328226/949359 K 6 shells V 22 dir w-6.0.r328020/4041 K 8 sysutils V 25 dir b-339.0.r328294/55223 K 8 textproc V 25 dir 1-322.0.r328232/85484 K 9 ukrainian V 29 dir g-39704.0.r327888/1002182 K 10 vietnamese V 26 dir 1-4812.0.r327775/20157 K 3 www V 26 dir 1-114.0.r328268/127304 K 3 x11 V 24 dir 1-16.0.r328295/24603 K 10 x11-clocks V 27 dir 1-931.0.r327804/1222496 K 11 x11-drivers V 27 dir 1-157567.0.r328132/5235 K 6 x11-fm V 25 dir 1-691.0.r327780/34933 K 9 x11-fonts V 27 dir 1-543.0.r328226/1267012 K 11 x11-servers V 25 dir 1n-710.0.r327782/8436 K 10 x11-themes V 29 dir 1-14410.0.r328226/1277977 K 12 x11-toolkits V 27 dir 1-120.0.r327888/1194777 K 6 x11-wm V 25 dir 1-40.0.r328166/523666 END ENDREP id: 2-1.0.r328301/14419 type: dir pred: 2-1.0.r328300/25967 count: 327977 text: 328301 11092 3314 3314 d5d60bed5d88d29ddcc23b5de0417965 props: 308235 235189 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r325814/31077 K 4 head V 23 dir 2-1.0.r328301/14419 K 8 svnadmin V 22 dir 3-1.0.r328078/1667 K 4 tags V 22 dir 8-1.0.r316236/4666 END ENDREP id: 0.0.r328301/14817 type: dir pred: 0.0.r328300/26365 count: 328301 text: 328301 14642 162 162 24b3c87e1647b1740104d4b13d0b5e1e props: 326465 0 620 0 631089891639cf20878ff168189d346f cpath: / copyroot: 0 / minfo-cnt: 6 5-226289.0.t328300-71bq modify-file true false /head/net-im/libmsn/files/patch-msn__util.cpp 14817 15039