Menu
▾
▴
[fuse-emulator-cvs] [fuse] branch master updated: Rename 'icon' to 'generic-icon' in the mime-info file
|
From: <sba...@us...> - 2023-06-03 04:51:12
|
This is an automated email from the git hooks/post-receive-user script. sbaldovi pushed a commit to branch master in repository fuse. View the commit online: https://sourceforge.net/p/fuse-emulator/fuse/ci/9f559346b239a12928207bdf446697a364d0eb00/ The following commit(s) were added to refs/heads/master by this push: new 9f559346 Rename 'icon' to 'generic-icon' in the mime-info file 9f559346 is described below commit 9f559346b239a12928207bdf446697a364d0eb00 Author: Alberto Garcia <be...@ig...> AuthorDate: Sat Jun 3 06:49:18 2023 +0200 Rename 'icon' to 'generic-icon' in the mime-info file The Freedesktop theme spec says that icons are first searched in the current theme, then in its parents and finally in the default "hicolor" theme. "hicolor" is where Fuse installs its icons, however if generic-icon is not specified in fuse.xml then it defaults to application-x-generic. This means that if the current theme provides an icon named application-x-generic it will be used instead of the ZX Spectrum one. Fixes bug #494 --- data/fuse.xml.in | 72 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/data/fuse.xml.in b/data/fuse.xml.in index a5e215c6..e5acf207 100644 --- a/data/fuse.xml.in +++ b/data/fuse.xml.in @@ -5,17 +5,17 @@ <magic> <match type="string" offset="0" value="Compressed Square Wave\x1a"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.csw"/> </mime-type> <mime-type type="application/x-spectrum-dck"> <comment>ZX Spectrum cartridge</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.dck"/> </mime-type> <mime-type type="application/x-spectrum-d80"> <comment>ZX Spectrum disk</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.d40"/> <glob pattern="*.d80"/> </mime-type> @@ -25,7 +25,7 @@ <match type="string" offset="0" value="MV - CPCEMU Disk-File\x0d\x0aDisk-Info\x0d\x0a"/> <match type="string" offset="0" value="EXTENDED CPC DSK File\x0d\x0aDisk-Info\x0d\x0a"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.dsk"/> </mime-type> <mime-type type="application/x-spectrum-fdi"> @@ -33,7 +33,7 @@ <magic> <match type="string" offset="0" value="FDI"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.fdi"/> </mime-type> <mime-type type="application/x-spectrum-hdf"> @@ -41,42 +41,42 @@ <magic> <match type="string" offset="0" value="RS-IDE\x1a"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.hdf"/> </mime-type> <mime-type type="application/x-spectrum-img"> <comment>ZX Spectrum disk</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.img"/> </mime-type> <mime-type type="application/x-spectrum-ltp"> <comment>ZX Spectrum tape</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.ltp"/> </mime-type> <mime-type type="application/x-spectrum-mdr"> <comment>ZX Spectrum microdrive</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.mdr"/> </mime-type> <mime-type type="application/x-spectrum-mgt"> <comment>ZX Spectrum disk</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.mgt"/> </mime-type> <mime-type type="application/x-spectrum-mgtsnp"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.mgtsnp"/> </mime-type> <mime-type type="application/x-spectrum-opd"> <comment>ZX Spectrum disk</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.opd"/> </mime-type> <mime-type type="application/x-spectrum-opu"> <comment>ZX Spectrum disk</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.opu"/> </mime-type> <mime-type type="application/x-spectrum-pzx"> @@ -84,7 +84,7 @@ <magic> <match type="string" offset="0" value="PZXT"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.pzx"/> </mime-type> <mime-type type="application/x-spectrum-raw"> @@ -92,12 +92,12 @@ <magic> <match type="string" offset="0" value="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Raw tape sample"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.raw"/> </mime-type> <mime-type type="application/x-spectrum-rom"> <comment>ZX Spectrum cartridge</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.rom"/> </mime-type> <mime-type type="application/x-spectrum-rzx"> @@ -105,7 +105,7 @@ <magic> <match type="string" offset="0" value="RZX!"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.rzx"/> </mime-type> <mime-type type="application/x-spectrum-sad"> @@ -113,7 +113,7 @@ <magic> <match type="string" offset="0" value="Aley's disk backup"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.sad"/> </mime-type> <mime-type type="application/x-spectrum-scl"> @@ -121,43 +121,43 @@ <magic> <match type="string" offset="0" value="SINCLAIR"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.scl"/> </mime-type> <mime-type type="application/x-spectrum-slt"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.slt"/> </mime-type> <mime-type type="application/x-spectrum-sna"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.sna"/> <glob pattern="*.snapshot"/> </mime-type> <mime-type type="application/x-spectrum-s"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.s"/> </mime-type> <mime-type type="application/x-spectrum-snp"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.snp"/> </mime-type> <mime-type type="application/x-spectrum-sp"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.sp"/> </mime-type> <mime-type type="application/x-spectrum-spc"> <comment>ZX Spectrum tape</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.spc"/> </mime-type> <mime-type type="application/x-spectrum-sta"> <comment>ZX Spectrum tape</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.sta"/> </mime-type> <mime-type type="application/x-spectrum-szx"> @@ -165,7 +165,7 @@ <magic> <match type="string" offset="0" value="ZXST"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.szx"/> <glob pattern="*.zx-state"/> </mime-type> @@ -175,12 +175,12 @@ <match type="string" offset="0" value="TD"/> <match type="string" offset="0" value="td"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.td0"/> </mime-type> <mime-type type="application/x-spectrum-tap"> <comment>ZX Spectrum tape</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.tap"/> </mime-type> <mime-type type="application/x-spectrum-trd"> @@ -188,7 +188,7 @@ <magic> <match type="string" offset="0" value="SINCLAIR"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.trd"/> </mime-type> <mime-type type="application/x-spectrum-tzx"> @@ -196,7 +196,7 @@ <magic> <match type="string" offset="0" value="ZXTape!\x1a"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.tzx"/> </mime-type> <mime-type type="application/x-spectrum-udi"> @@ -204,12 +204,12 @@ <magic> <match type="string" offset="0" value="UDI!"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.udi"/> </mime-type> <mime-type type="application/x-spectrum-z80"> <comment>ZX Spectrum snapshot</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.z80"/> </mime-type> <mime-type type="application/x-spectrum-zxs"> @@ -217,7 +217,7 @@ <magic> <match type="string" offset="0" value="SNAP"/> </magic> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.zxs"/> </mime-type> ##LIBSPECTRUM_HAVE_AUDIOFILE_BEGIN## @@ -233,7 +233,7 @@ ##LIBSPECTRUM_HAVE_ZLIB_BEGIN## <mime-type type="application/x-spectrum-compressed"> <comment>ZX Spectrum compressed</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.csw.gz"/> <glob pattern="*.dck.gz"/> <glob pattern="*.mgtsnp.gz"/> @@ -261,7 +261,7 @@ ##LIBSPECTRUM_HAVE_BZ2_BEGIN## <mime-type type="application/x-spectrum-compressed-bz2"> <comment>ZX Spectrum compressed</comment> - <icon name="application-x-spectrum"/> + <generic-icon name="application-x-spectrum"/> <glob pattern="*.csw.bz2"/> <glob pattern="*.dck.bz2"/> <glob pattern="*.mgtsnp.bz2"/> |
