DELTA SVN‚C‚E€‚C‚C--- libs/oxygenhelper.cpp.orig 2018-01-29 16:36:56 UTC +++ libs/oxygenhelper.cpp @@ -1117,7 +1117,7 @@ namespace Oxygen &data); // finish if no data is found - if( data == None || n != 1 ) return false; + if( data == NULL || n != 1 ) return false; else return *data; } ENDREP id: 5-460322.0.r460322/353 type: file count: 0 text: 460322 0 340 323 efae51303beb55ba5f1e72645f6640a0 3e9f70fda42af837b1cee78987c924b1b90135a2 460321-9v6q/_7 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/x11-themes/kde4-style-oxygen-transparent/files/patch-libs_oxygenhelper.cpp copyroot: 0 / PLAIN K 27 patch-libs_oxygenhelper.cpp V 27 file 5-460322.0.r460322/353 END ENDREP id: 3-460322.0.r460322/755 type: dir count: 0 text: 460322 672 70 0 15f47a771f560edcdec62c306360792d cpath: /head/x11-themes/kde4-style-oxygen-transparent/files copyroot: 0 / PLAIN K 8 Makefile V 31 file 5-313106.0.r439367/1886359 K 8 distinfo V 27 file 8-313106.0.r351486/576 K 5 files V 26 dir 3-460322.0.r460322/755 K 9 pkg-descr V 28 file a-313106.0.r313106/2177 K 9 pkg-plist V 25 file c-313106.0.r352897/0 END ENDREP id: 4-313106.0.r460322/1179 type: dir pred: 4-313106.0.r439367/1886901 count: 17 text: 460322 931 235 0 7920cac2a03e02e290752508f43e9a02 cpath: /head/x11-themes/kde4-style-oxygen-transparent copyroot: 0 / PLAIN K 8 Makefile V 27 file 9-98633.0.r459580/1105 K 18 adapta-backgrounds V 27 dir 4-446315.0.r458565/2485 K 16 adapta-gtk-theme V 27 dir 4-446316.0.r449890/1892 K 14 adwaita-common V 30 dir 4-404931.0.r449591/2351526 K 18 adwaita-icon-theme V 31 dir 1k3-372768.0.r439206/145743 K 11 adwaita-qt4 V 27 dir e-404931.0.r442026/2518 K 11 adwaita-qt5 V 27 dir k-404931.0.r442026/3081 K 15 audacious-skins V 29 dir 4-201408.0.r421683/813085 K 7 beastie V 26 dir 4-142255.0.r445069/930 K 17 claws-mail-themes V 26 dir 4-225838.0.r394914/572 K 10 clearlooks V 30 dir 4-129873.0.r428152/1749644 K 19 clearlooks-metacity V 30 dir 4-131791.0.r386312/2720949 K 23 clearlooks-phenix-theme V 30 dir 4-315410.0.r436494/1053447 K 17 clearlooks-themes V 26 dir 4-133192.0.r341355/423 K 24 clearlooks-themes-extras V 30 dir 4-133113.0.r412351/1898877 K 20 cursor-ardoise-theme V 29 dir 4-416905.0.r448082/124452 K 27 cursor-chameleon-anthracite V 29 dir 2-258672.0.r448082/125521 K 28 cursor-chameleon-darkskyblue V 29 dir d-258672.0.r448082/126601 K 22 cursor-chameleon-pearl V 29 dir n-258672.0.r448082/127671 K 24 cursor-chameleon-skyblue V 29 dir x-258672.0.r448082/128746 K 22 cursor-chameleon-white V 30 dir 17-258672.0.r448082/130547 K 20 cursor-crystal-theme V 29 dir 4-200505.0.r448082/131623 K 19 cursor-dmz-aa-theme V 29 dir 4-184496.0.r448082/132357 K 16 cursor-dmz-theme V 29 dir 4-184494.0.r448082/133085 K 12 cursor-ecliz V 29 dir 4-253971.0.r448082/134131 K 23 cursor-grounation-theme V 29 dir 4-156684.0.r448082/135202 K 19 cursor-jimmac-theme V 29 dir 4-139517.0.r448082/136269 K 20 cursor-neutral-theme V 29 dir 4-156681.0.r448082/137340 K 26 cursor-neutral-white-theme V 29 dir 4-267190.0.r448082/138424 K 18 cursor-polar-theme V 29 dir 4-148040.0.r448082/139500 K 10 e16-themes V 26 dir 4-218910.0.r446812/955 K 14 emerald-themes V 32 dir bwb-191544.0.r412351/1901837 K 24 fluxbox-tenr-styles-pack V 30 dir 4-203730.0.r415738/1700784 K 11 fvwm-themes V 29 dir 2-41021.0.r413746/1661588 K 17 gnome-backgrounds V 31 dir jv-130972.0.r408881/1460378 K 25 gnome-icon-theme-symbolic V 32 dir 1kh-372768.0.r415500/1113947 K 11 gnome-icons V 30 dir 2-102933.0.r451901/1016540 K 23 gnome-icons-aqua-fusion V 29 dir 4-102934.0.r428132/401666 K 19 gnome-icons-crystal V 29 dir 4-102938.0.r428132/402411 K 24 gnome-icons-dropline-neu V 27 dir 4-258765.0.r449825/1000 K 24 gnome-icons-dropline-nou V 27 dir 4-220994.0.r449331/1001 K 22 gnome-icons-elementary V 27 dir 4-279919.0.r441989/5087 K 18 gnome-icons-faenza V 27 dir 4-288116.0.r422636/1396 K 23 gnome-icons-gentoo-test V 29 dir 4-102939.0.r428132/403151 K 16 gnome-icons-gion V 26 dir 4-220986.0.r449989/975 K 16 gnome-icons-iris V 29 dir 4-102940.0.r428132/403889 K 16 gnome-icons-jini V 30 dir 4-221002.0.r451901/1017269 K 16 gnome-icons-lila V 26 dir 6-127927.0.r449763/678 K 21 gnome-icons-noia-full V 29 dir 4-102941.0.r428132/405353 K 21 gnome-icons-noia-warm V 29 dir 4-102942.0.r428132/406090 K 19 gnome-icons-refined V 29 dir 4-102943.0.r428132/406830 K 17 gnome-icons-slick V 29 dir 4-102944.0.r428132/407566 K 22 gnome-icons-snow-apple V 29 dir 4-102946.0.r428132/408310 K 19 gnome-icons-stylish V 29 dir 4-102947.0.r428132/409056 K 24 gnome-icons-ximian-south V 29 dir 4-102948.0.r428132/409803 K 12 gnome-themes V 29 dir 2-67450.0.r412351/1905580 K 19 gnome-themes-extras V 29 dir 2-82901.0.r415500/1114745 K 21 gnome-themes-standard V 31 dir 1kr-372768.0.r439206/147161 K 14 greybird-theme V 30 dir 4-315403.0.r436494/1054218 K 13 gtk-E17-theme V 29 dir 4-407831.0.r439206/148842 K 33 gtk-aluminumalloy-cryogenic-theme V 26 dir 4-117798.0.r443503/977 K 28 gtk-aluminumalloy-smog-theme V 27 dir 4-117797.0.r443503/1672 K 29 gtk-aluminumalloy-toxic-theme V 27 dir 4-117799.0.r443503/2366 K 32 gtk-aluminumalloy-volcanic-theme V 27 dir 4-117795.0.r443503/3113 K 27 gtk-aquaextremesunken-theme V 28 dir 4-129755.0.r378152/26199 K 14 gtk-arc-themes V 27 dir 4-420491.0.r439438/2924 K 17 gtk-aurora-engine V 30 dir 4-245673.0.r428152/1750380 K 20 gtk-blueprint-engine V 30 dir 4-347296.0.r428152/1751117 K 19 gtk-cleanice-engine V 29 dir 2-78397.0.r428152/1751855 K 23 gtk-digital-cream-theme V 30 dir 4-172560.0.r425174/1209642 K 25 gtk-digital-harmony-theme V 30 dir 4-172566.0.r425174/1210393 K 12 gtk-engines2 V 29 dir j-15684.0.r428152/1752586 K 14 gtk-envy-theme V 30 dir 4-156692.0.r412351/1909385 K 18 gtk-equinox-engine V 30 dir 2-263806.0.r428152/1753323 K 14 gtk-gray-theme V 30 dir 4-156694.0.r412351/1910862 K 14 gtk-lila-theme V 28 dir 4-129209.0.r378152/34283 K 21 gtk-lila-theme-extras V 28 dir 4-129211.0.r378152/35022 K 26 gtk-longhorninspirat-theme V 30 dir 4-130071.0.r425174/1211146 K 14 gtk-milk-theme V 30 dir 4-130021.0.r425174/1211887 K 16 gtk-murrina-aqua V 30 dir 4-175274.0.r412351/1911597 K 28 gtk-murrina-fancy-clearlooks V 30 dir 4-179227.0.r412351/1912344 K 21 gtk-murrina-lightblue V 30 dir e-175274.0.r412351/1913095 K 18 gtk-murrine-engine V 30 dir 4-175264.0.r428152/1754059 K 18 gtk-murrine-themes V 30 dir 4-175272.0.r412351/1913837 K 17 gtk-nodoka-engine V 30 dir 4-234905.0.r428152/1754796 K 17 gtk-oxygen-engine V 30 dir 2-266284.0.r428152/1755534 K 12 gtk-qnxtheme V 25 dir 2-74301.0.r442259/770 K 14 gtk-qt4-engine V 30 dir n-110430.0.r439367/1883155 K 15 gtk-xfce-engine V 28 dir 2-67773.0.r384919/733495 K 18 gtk3-oxygen-engine V 30 dir d-266284.0.r428152/1757054 K 17 gtk3-unico-engine V 30 dir 4-315400.0.r436494/1054944 K 17 icon-naming-utils V 30 dir 4-149643.0.r412351/1916061 K 16 icons-human-azul V 30 dir 4-160967.0.r415738/1706011 K 11 icons-tango V 30 dir 4-149645.0.r415500/1115481 K 18 icons-tango-extras V 30 dir 4-184498.0.r412351/1917537 K 12 irssi-themes V 29 dir 4-173253.0.r421683/813805 K 14 kde-gtk-config V 30 dir 4-312412.0.r439367/1883922 K 25 kde-icons-black-and-white V 29 dir 4-203084.0.r427946/180997 K 26 kde-icons-gartoon-blue-svg V 30 dir 4-122363.0.r415503/1744396 K 21 kde-icons-gartoon-svg V 30 dir 4-122358.0.r415503/1745161 K 24 kde-icons-graphite-rade8 V 30 dir 4-101438.0.r415503/1745915 K 22 kde-icons-kool-gorilla V 30 dir 4-101442.0.r415503/1747417 K 20 kde-icons-lime-rade8 V 30 dir 4-101953.0.r415503/1748168 K 14 kde-icons-lush V 30 dir 4-101445.0.r415503/1748914 K 14 kde-icons-noia V 30 dir 4-101432.0.r417166/1383398 K 18 kde-icons-nuovext2 V 30 dir 4-203116.0.r415503/1750451 K 16 kde-icons-nuvola V 30 dir 4-101451.0.r415503/1751201 K 17 kde4-base-artwork V 31 dir nz-311483.0.r439367/1884666 K 17 kde4-style-bespin V 30 dir 4-245242.0.r444324/1324756 K 19 kde4-style-nitrogen V 30 dir e-245242.0.r439367/1886156 K 29 kde4-style-oxygen-transparent V 27 dir 4-313106.0.r460322/1179 K 20 kde4-style-polyester V 30 dir e-162832.0.r439367/1887706 K 20 kde4-style-skulpture V 30 dir 4-245258.0.r439367/1888449 K 15 kde4-wallpapers V 31 dir ps-283641.0.r439367/1889201 K 23 kde4-wallpapers-freebsd V 36 dir r-8435.13-315373.r415864/1521191 K 20 kde4-windeco-crystal V 30 dir e-137360.0.r444324/1325543 K 22 kde4-windeco-dekorator V 30 dir 2-233165.0.r439367/1890738 K 11 kdeartwork4 V 26 dir f-46546.0.r443732/1306 K 16 kf5-breeze-icons V 31 dir gu-426118.0.r459233/1044314 K 14 kf5-kemoticons V 31 dir h8-426118.0.r459233/1045063 K 15 kf5-kiconthemes V 31 dir hi-426118.0.r459233/1045811 K 17 kf5-oxygen-icons5 V 31 dir hs-426118.0.r459233/1046605 K 13 lumina-themes V 26 dir 4-453596.0.r457652/939 K 12 lxappearance V 27 dir 4-215434.0.r432556/1357 K 15 lxde-icon-theme V 26 dir 4-262170.0.r433714/695 K 16 mate-backgrounds V 37 dir jv-130972.w-334661.r445014/769197 K 15 mate-icon-theme V 35 dir 4-67440.x-334661.r445014/770854 K 22 mate-icon-theme-faenza V 30 dir 8k-334661.0.r445014/772310 K 11 mate-themes V 35 dir 2-67450.y-334661.r452089/211801 K 38 metacity-aluminumalloy-cryogenic-theme V 27 dir 4-117802.0.r347726/4408 K 33 metacity-aluminumalloy-smog-theme V 27 dir 4-117801.0.r347726/5018 K 34 metacity-aluminumalloy-toxic-theme V 27 dir 4-117803.0.r347726/5624 K 37 metacity-aluminumalloy-volcanic-theme V 27 dir 4-117800.0.r347726/6234 K 32 metacity-aquaextremesunken-theme V 27 dir 4-129756.0.r356282/8126 K 28 metacity-digital-cream-theme V 27 dir 4-172561.0.r356282/8726 K 30 metacity-digital-harmony-theme V 27 dir 4-172567.0.r356282/9324 K 31 metacity-longhorninspirat-theme V 27 dir 4-130073.0.r356282/9925 K 19 metacity-milk-theme V 27 dir 4-130022.0.r351829/1564 K 23 metacity-theme-microgui V 26 dir 4-108332.0.r433726/863 K 15 metacity-themes V 30 dir 4-104712.0.r412351/1924967 K 11 mint-themes V 31 dir 1l1-372768.0.r385665/571071 K 20 murrine-configurator V 29 dir 4-176768.0.r453874/347566 K 6 nimbus V 30 dir 4-275089.0.r428152/1758513 K 11 numix-theme V 27 dir 4-339315.0.r451355/1231 K 17 openbox-arc-theme V 27 dir 4-459580.0.r459580/2747 K 14 openbox-themes V 27 dir 4-151995.0.r453412/7494 K 16 plank-theme-moka V 30 dir 4-363860.0.r436494/1056433 K 17 qt4-style-Kvantum V 27 dir 2-415946.0.r457222/1897 K 15 qt4-style-float V 29 dir 4-265154.0.r442740/843641 K 15 qt4-style-phase V 29 dir 2-265155.0.r442740/844361 K 22 qt4-style-quantumstyle V 29 dir 4-265153.0.r442740/845047 K 17 qt5-style-Kvantum V 27 dir 4-415949.0.r457222/3249 K 17 qt5-style-plugins V 30 dir 4-415999.0.r441503/1784081 K 7 qtcurve V 27 dir 4-386718.0.r457680/1452 K 12 qtcurve-gtk2 V 27 dir 2-219512.0.r424491/2715 K 12 qtcurve-kde4 V 30 dir 2-219514.0.r439367/1892985 K 11 qtcurve-qt4 V 29 dir 2-255068.0.r442740/845627 K 11 qtcurve-qt5 V 29 dir 10-386718.0.r386718/12612 K 13 qtcurve-utils V 29 dir 14-386718.0.r386718/13119 K 8 rezlooks V 30 dir 4-166957.0.r428152/1759182 K 14 sawfish-themes V 30 dir 4-109743.0.r424411/1950725 K 24 sddm-freebsd-black-theme V 27 dir 4-450763.0.r450763/4105 K 11 slim-themes V 27 dir 4-234406.0.r420386/1030 K 16 thewidgetfactory V 30 dir 4-211124.0.r428152/1759902 K 11 ubuntulooks V 30 dir 4-160969.0.r428152/1760681 K 14 xcursor-themes V 31 dir c1v-191544.0.r448082/140572 K 14 xfce-evolution V 27 dir 4-454895.0.r455907/3980 K 21 xfce-icons-elementary V 28 dir 4-440480.0.r440480/64654 END ENDREP id: 1-14410.0.r460322/11379 type: dir pred: 1-14410.0.r459580/12905 count: 2236 text: 460322 1385 9981 0 1a2350d04b12ca39766793b682087d2a cpath: /head/x11-themes copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 27 file 1-411777.0.r457790/700 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 27 file 1-99373.0.r459915/5609 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r457728/49 K 4 GIDs V 28 file 1-168311.0.r456695/4038 K 8 Keywords V 27 dir 1-314142.0.r419368/1305 K 5 LEGAL V 25 file 1-748.0.r460155/2066 K 5 MOVED V 26 file 1-69878.0.r460297/364 K 8 Makefile V 24 file 1-6.0.r424411/75633 K 2 Mk V 22 dir 1-5.0.r460296/8166 K 6 README V 25 file 1-2408.0.r340854/956 K 9 Templates V 25 dir 1-2932.0.r453460/4644 K 5 Tools V 26 dir 3-15302.0.r459958/3071 K 4 UIDs V 28 file 4-168311.0.r456695/4321 K 8 UPDATING V 28 file 1-102685.0.r459492/3082 K 13 accessibility V 26 dir 1-42583.0.r459549/2647 K 6 arabic V 26 dir 1-38973.0.r455868/4402 K 9 archivers V 25 dir 1-242.0.r460318/13139 K 5 astro V 24 dir 1-301.0.r460235/7348 K 5 audio V 25 dir 1-148.0.r460315/46680 K 4 base V 28 dir 1-420954.0.r431796/79632 K 10 benchmarks V 23 dir 1-62.0.r460126/6457 K 7 biology V 27 dir 1-9066.0.r459315/251090 K 3 cad V 24 dir 1-276.0.r460059/5966 K 7 chinese V 25 dir 1-3770.0.r459688/6500 K 5 comms V 24 dir 1-76.0.r460316/11192 K 10 converters V 26 dir 1-1561.0.r460271/11330 K 9 databases V 25 dir 1-771.0.r460272/59938 K 9 deskutils V 26 dir 1-2098.0.r460249/16749 K 5 devel V 25 dir 1-73.0.r460310/331858 K 3 dns V 26 dir 1-6145.0.r460312/14390 K 7 editors V 23 dir 4-6.0.r460244/17960 K 9 emulators V 25 dir 1-181.0.r460313/11310 K 7 finance V 26 dir 1-4110.0.r460260/11917 K 6 french V 26 dir 1-25673.0.r460222/1726 K 3 ftp V 24 dir 1-199.0.r460317/5947 K 5 games V 26 dir 1-104.0.r460155/447402 K 6 german V 25 dir 1-7451.0.r460268/2682 K 8 graphics V 25 dir 1-94.0.r460296/399400 K 6 hebrew V 28 dir 3-31142.0.r453378/143444 K 9 hungarian V 29 dir 1p-38973.0.r453378/144909 K 3 irc V 25 dir 1-42.0.r459315/999072 K 8 japanese V 25 dir 1-410.0.r459643/17498 K 4 java V 25 dir 1-2798.0.r460251/8202 K 6 korean V 25 dir 1-5873.0.r459894/2809 K 4 lang V 24 dir 1-15.0.r460311/19627 K 4 mail V 24 dir 1-57.0.r460308/41724 K 4 math V 25 dir 1-162.0.r460302/41652 K 4 misc V 24 dir 7-35.0.r460319/27594 K 10 multimedia V 26 dir d-333.0.r460155/571716 K 3 net V 24 dir 1-22.0.r460314/85467 K 6 net-im V 28 dir 15-11144.0.r460256/12992 K 8 net-mgmt V 26 dir r-1011.0.r460163/22039 K 7 net-p2p V 26 dir g-29106.0.r459998/8416 K 4 news V 24 dir 1-145.0.r460058/5048 K 4 palm V 27 dir 1-6646.0.r451378/103414 K 6 polish V 27 dir tv-38973.0.r460269/2189 K 10 ports-mgmt V 25 dir 1-5132.0.r460294/5555 K 10 portuguese V 28 dir 1-17842.0.r459220/348661 K 5 print V 24 dir 1-79.0.r460306/15397 K 7 russian V 25 dir 1-1559.0.r459399/3355 K 7 science V 26 dir n-5356.0.r460232/12208 K 8 security V 25 dir 1-269.0.r460292/69236 K 6 shells V 24 dir w-6.0.r460155/642811 K 8 sysutils V 25 dir b-339.0.r460320/73209 K 8 textproc V 25 dir 1-322.0.r460284/98518 K 9 ukrainian V 28 dir g-39704.0.r453378/172381 K 10 vietnamese V 25 dir 1-4812.0.r453718/3041 K 3 www V 26 dir 1-114.0.r460307/147975 K 3 x11 V 24 dir 1-16.0.r460321/31573 K 10 x11-clocks V 24 dir 1-931.0.r460005/3524 K 11 x11-drivers V 27 dir 1-157567.0.r459895/4671 K 6 x11-fm V 24 dir 1-691.0.r457966/3630 K 9 x11-fonts V 25 dir 1-543.0.r460287/11721 K 11 x11-servers V 28 dir 1n-710.0.r455167/1533961 K 10 x11-themes V 27 dir 1-14410.0.r460322/11379 K 12 x11-toolkits V 26 dir 1-120.0.r460296/444488 K 6 x11-wm V 23 dir 1-40.0.r460161/7339 END ENDREP id: 2-1.0.r460322/15122 type: dir pred: 2-1.0.r460321/35305 count: 454925 text: 460322 11556 3553 0 d1d2222bf32888829d28f643a525a95a props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r460130/47965 K 4 head V 23 dir 2-1.0.r460322/15122 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r458817/1280 K 4 tags V 22 dir 8-1.0.r449812/5278 END ENDREP id: 0.0.r460322/15559 type: dir pred: 0.0.r460321/35742 count: 460322 text: 460322 15341 205 0 8cd0dab02e6abe931349bd5c313d33f1 props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 37 _3.0.t460321-9v6q add-dir false false /head/x11-themes/kde4-style-oxygen-transparent/files _5.0.t460321-9v6q add-file true true /head/x11-themes/kde4-style-oxygen-transparent/files/patch-libs_oxygenhelper.cpp 15559 15783