From 7040dded11aa363d54684da3295d8cd50a2eab3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Fri, 19 Feb 2021 12:51:44 +0000
Subject: [PATCH] icons: remove obsolete usb icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are now using a standard symbolic icon so don't need the custom USB
icon.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 icons/24x24/virt-viewer-usb.png         | Bin 1063 -> 0 bytes
 icons/meson.build                       |  23 ---
 icons/scalable/virt-viewer-usb.svg      | 204 ------------------------
 mingw-virt-viewer.spec.in               |   1 -
 src/resources/virt-viewer.gresource.xml |   1 -
 virt-viewer.spec.in                     |   1 -
 6 files changed, 230 deletions(-)
 delete mode 100644 icons/24x24/virt-viewer-usb.png
 delete mode 100644 icons/scalable/virt-viewer-usb.svg

diff --git a/icons/24x24/virt-viewer-usb.png b/icons/24x24/virt-viewer-usb.png
deleted file mode 100644
index e23661e402387bd2601c634860d2627b0aebe721..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1063
zcmV+?1laqDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x1KdeOK~zYIm6lCtTvZgufA`)uv9=~5H8!DOT3ZV#;-;lk5|a`XQK1Vz
zz=f7tUFpu9;L;c?f}1YfDNPYU3A#vwh#&Q%X)SS~p|wpi+N8-OO){OAbdt`z`{m-z
zymXS8Ko1;v@6Y-CpL@@HVsv!0Mb`N<c;AI!3xM|?Aq4j#6+WH<@Qc&(c;Hp^MN>md
zPeXm91VPzG2!Z!y#~3?1Jb?h7?|8HnG`15Wwku=cw=CzEo?gf<d>KTM?yi5JQLe78
zBu3R_G`+~l)4u`Gv`z8&-sVj^s^8Y2GIP^UN^4yTJl0yAb5(UAT%ouB0>*ia^Yr##
zU?E(oY44l^z*?7*#u&T@Yi(66M4I0ION4oilnN;oVLrwRk*?|IJs4vMv^D@q*7fq)
z&=tm}myk+U;A7KEd_HuA!Hbg>__yyrmpp522%NRV6je{~&MSv`??ev(oo}51;QXh@
z09ajJ<?N;D3j4J<9%n6qu`xx?*{TV0xm)CNw*Zhz0WdQY2MzO4f|aEl$9pi=5NNF{
zGF#^vIDdoTtBU}1v^Voo=ffx|5K<+!;fkj3tIG+tu>;Ur6If$$&L)`$hG!TYnM;fY
zN9I5XUhdeLRGZ5e_-J69xiF%wwUJNW?xwlnegLMXt|y&XQ=-T@mt?*;wv1d?)gR*_
zFC1=7@Q=Sq$H7|~Ir-)jtcLUam#w7OITur8w81&QHUlXUvhu_@6wcWMpA940S{mp(
zafrh0d92+yKj%C~8>BHNZpX%5Jae!OsZ@pDSC=A}*U9^?)<!;j;}9$1O`=FAzIUs0
zcI_U-U|hw~gAbvU;=4bm@!nGxC>ECsocew)8R!Sc53rn_#Tc`p^1FwvwIQ(9U`ulV
z$S%%v^uP{Y>)8zm@^>QozP`fcsW2IGxG=M6@HjynH!#LvjIH1?lgW_DWJ)8Ey!+xl
zP7O^mGLZ$KSS)TD9Ke{EBB`||o<sGeWsKp*<aJt`QV69GO7Y{>J0+fLt1%|N2gaDv
zf~vkM0Dc<R{QmE4Wa$*0o6uMXJ^NCdP*fUnOp&R%DggevDG=*c!r$|PBYSK6l;Z~F
zRyOM(6{J{qH3(FIwYsKHnR*!~h>~?tO}pB+BT5&rtX=!JZ|b9U6n9{?(Zymh<(#ki
z$vm=0BIFK!{U_e4-TNP;d$%VuUA=1|1jS;6)h-IW=iGRDtmlzkdjcsXQp!@IwI6_`
z+#=7m@8s3a#{kG?v&_zB*t#`daHS7DLWtxPji;{}@9ob)v0#p+)9KS=W7nPnf|{h>
hn;50k58lex{|8sH2#IslN<07n002ovPDHLkV1iv){{;X5

diff --git a/icons/meson.build b/icons/meson.build
index a77cda7..fe91ad4 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -8,15 +8,6 @@ logo_icon_sizes = [
   'scalable',
 ]
 
-misc_icon_sizes = [
-  '24x24',
-  'scalable',
-]
-
-misc_icon_names = [
-  'usb',
-]
-
 foreach icon_size: logo_icon_sizes
   if icon_size == 'scalable'
     src_icon = 'virt-viewer.svg'
@@ -29,20 +20,6 @@ foreach icon_size: logo_icon_sizes
   )
 endforeach
 
-foreach icon_size: misc_icon_sizes
-  foreach icon_name: misc_icon_names
-    if icon_size == 'scalable'
-      src_icon = 'virt-viewer-' + icon_name + '.svg'
-    else
-      src_icon = 'virt-viewer-' + icon_name + '.png'
-    endif
-    install_data(
-      join_paths(icon_size, src_icon),
-      install_dir: join_paths(datadir, 'icons', 'hicolor', icon_size, 'devices')
-    )
-  endforeach
-endforeach
-
 
 if host_machine.system() == 'windows'
   icotool = find_program('icotool')
diff --git a/icons/scalable/virt-viewer-usb.svg b/icons/scalable/virt-viewer-usb.svg
deleted file mode 100644
index 4101f6e..0000000
--- a/icons/scalable/virt-viewer-usb.svg
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg9434"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="usb.svg">
-  <defs
-     id="defs9436">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient10012">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop10014" />
-      <stop
-         style="stop-color:#747671;stop-opacity:1"
-         offset="1"
-         id="stop10016" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9985">
-      <stop
-         style="stop-color:#a6a6a6;stop-opacity:1;"
-         offset="0"
-         id="stop9987" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="1"
-         id="stop9989" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9977">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1;"
-         offset="0"
-         id="stop9979" />
-      <stop
-         style="stop-color:#fafafa;stop-opacity:0;"
-         offset="1"
-         id="stop9981" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9401"
-       id="linearGradient9407"
-       x1="714.20172"
-       y1="-81.798248"
-       x2="714.20172"
-       y2="-64.777008"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient9401">
-      <stop
-         style="stop-color:#2e5991;stop-opacity:1"
-         offset="0"
-         id="stop9403" />
-      <stop
-         style="stop-color:#4983c1;stop-opacity:1"
-         offset="1"
-         id="stop9405" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9977"
-       id="radialGradient9983"
-       cx="12.001339"
-       cy="1035.3622"
-       fx="12.001339"
-       fy="1035.3622"
-       r="11.03125"
-       gradientTransform="matrix(3.5911562,0,0,1.7223807,-31.098681,-747.92565)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9985"
-       id="linearGradient9991"
-       x1="13.481804"
-       y1="1057.5219"
-       x2="13.481804"
-       y2="1028.9601"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10012"
-       id="linearGradient10018"
-       x1="20.287706"
-       y1="1029.2219"
-       x2="20.287706"
-       y2="1052.9133"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="14.456171"
-     inkscape:cy="42.877288"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     showborder="false"
-     inkscape:window-width="1311"
-     inkscape:window-height="1189"
-     inkscape:window-x="764"
-     inkscape:window-y="173"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9463"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata9439">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <rect
-       style="color:#000000;fill:url(#linearGradient9991);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient10018);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect9973"
-       width="23.000017"
-       height="23.000017"
-       x="0.5"
-       y="1028.8622"
-       rx="2.1213202"
-       ry="2.1213202" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.9722718"
-       inkscape:original="M 2.625 1028.875 C 1.4497886 1028.875 0.5 1029.7935 0.5 1030.9688 L 0.5 1049.75 C 0.5 1050.9252 1.4497886 1051.875 2.625 1051.875 L 21.375 1051.875 C 22.550211 1051.875 23.5 1050.9252 23.5 1049.75 L 23.5 1030.9688 C 23.5 1029.7935 22.550211 1028.875 21.375 1028.875 L 2.625 1028.875 z "
-       xlink:href="#rect9973"
-       style="color:#000000;fill:none;stroke:url(#radialGradient9983);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path9975"
-       inkscape:href="#rect9973"
-       d="m 2.625,1029.8438 c -0.6686179,0 -1.15625,0.4735 -1.15625,1.125 l 0,18.7812 c 0,0.6513 0.5048954,1.1562 1.15625,1.1562 l 18.75,0 c 0.651354,0 1.15625,-0.5049 1.15625,-1.1562 l 0,-18.7812 c 0,-0.6515 -0.487633,-1.125 -1.15625,-1.125 l -18.75,0 z" />
-    <g
-       transform="translate(-703,1112.3622)"
-       style="display:inline;enable-background:new"
-       id="g9411">
-      <path
-         d="m 715,-83 -4,5 3,0 0,7.5625 -1.3125,-1.3125 C 712.86766,-72.1354 713,-72.54648 713,-73 c 0,-1.65685 -1.34315,-3 -3,-3 -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 0.45352,0 0.8646,-0.13234 1.25,-0.3125 l 2.625,2.4375 0.125,0.09375 c -1.15835,0.41551 -2,1.51118 -2,2.8125 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.30132 -0.84165,-2.39699 -2,-2.8125 l 0,-2.78125 4.4375,-4.4375 2.5625,0 0,-4 -4,0 0,1 0,1.5625 -3,3 0,-4.5625 3,0 -4,-5 z"
-         inkscape:href="#path9368"
-         id="path9399"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.82488477;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         xlink:href="#path9368"
-         inkscape:original="M 715 -83 L 711 -78 L 714 -78 L 714 -70.4375 L 712.6875 -71.75 C 712.86766 -72.1354 713 -72.54648 713 -73 C 713 -74.65685 711.65685 -76 710 -76 C 708.34315 -76 707 -74.65685 707 -73 C 707 -71.34315 708.34315 -70 710 -70 C 710.45352 -70 710.8646 -70.13234 711.25 -70.3125 L 713.875 -67.875 L 714 -67.78125 C 712.84165 -67.36574 712 -66.27007 712 -64.96875 C 712 -63.3119 713.34315 -61.96875 715 -61.96875 C 716.65685 -61.96875 718 -63.3119 718 -64.96875 C 718 -66.27007 717.15835 -67.36574 716 -67.78125 L 716 -70.5625 L 720.4375 -75 L 723 -75 L 723 -79 L 719 -79 L 719 -78 L 719 -76.4375 L 716 -73.4375 L 716 -78 L 719 -78 L 715 -83 z "
-         inkscape:radius="0"
-         sodipodi:type="inkscape:offset"
-         transform="translate(0,0.97227174)" />
-      <path
-         sodipodi:nodetypes="cccccsssscccsssccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path9368"
-         d="m 715,-83 -4,5 3,0 0,7.5625 -1.3125,-1.3125 C 712.86766,-72.1354 713,-72.54648 713,-73 c 0,-1.65685 -1.34315,-3 -3,-3 -1.65685,0 -3,1.34315 -3,3 0,1.65685 1.34315,3 3,3 0.45352,0 0.8646,-0.13234 1.25,-0.3125 l 2.61742,2.440641 0.13258,0.08709 c -1.15835,0.41551 -2,1.51118 -2,2.8125 0,1.65685 1.34315,3 3,3 1.65685,0 3,-1.34315 3,-3 0,-1.30132 -0.84165,-2.39699 -2,-2.8125 l 0,-2.777728 4.4375,-4.4375 2.5625,0 0,-4 -4,0 0,2.5625 -3,3 0,-4.5625 3,0 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient9407);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-      <rect
-         y="-84"
-         x="703"
-         height="24"
-         width="24"
-         id="rect9409"
-         style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-  </g>
-</svg>
diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in
index 47fc67d..6f95321 100644
--- a/mingw-virt-viewer.spec.in
+++ b/mingw-virt-viewer.spec.in
@@ -142,7 +142,6 @@ cp build_win64$MINGW_BUILDDIR_SUFFIX/data/virt-viewer-x64-@VERSION@.msi $RPM_BUI
 
 %dir %{mingw32_datadir}/virt-viewer/
 %{mingw32_datadir}/icons/hicolor/*/apps/*
-%{mingw32_datadir}/icons/hicolor/*/devices/*
 
 %{mingw32_mandir}/man1/virt-viewer.1*
 %{mingw32_mandir}/man1/remote-viewer.1*
diff --git a/src/resources/virt-viewer.gresource.xml b/src/resources/virt-viewer.gresource.xml
index 65f08c3..6cb2082 100644
--- a/src/resources/virt-viewer.gresource.xml
+++ b/src/resources/virt-viewer.gresource.xml
@@ -15,7 +15,6 @@
     <file alias="icons/16x16/virt-viewer.png">../../icons/16x16/virt-viewer.png</file>
     <file alias="icons/22x22/virt-viewer.png">../../icons/22x22/virt-viewer.png</file>
     <file alias="icons/24x24/virt-viewer.png">../../icons/24x24/virt-viewer.png</file>
-    <file alias="icons/24x24/virt-viewer-usb.png">../../icons/24x24/virt-viewer-usb.png</file>
     <file alias="icons/32x32/virt-viewer.png">../../icons/32x32/virt-viewer.png</file>
     <file alias="icons/48x48/virt-viewer.png">../../icons/48x48/virt-viewer.png</file>
     <file alias="icons/256x256/virt-viewer.png">../../icons/256x256/virt-viewer.png</file>
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index a18d62f..b3a820a 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -51,7 +51,6 @@ the display, and libvirt for looking up VNC/SPICE server details.
 %{_bindir}/%{name}
 %{_bindir}/remote-viewer
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/devices/*
 %{_datadir}/applications/remote-viewer.desktop
 %{_datadir}/metainfo/remote-viewer.appdata.xml
 %{_datadir}/mime/packages/virt-viewer-mime.xml