>From 5d0d0eb3c0c3447f0dcdc9f61edb4681348edb5f Mon Sep 17 00:00:00 2001
From: Federico Bruni <fede inventati org>
Date: Tue, 12 Jul 2016 23:15:05 +0200
Subject: [PATCH] change spam icon (issue 737862)

---
 icons/CMakeLists.txt                               |  3 +-
 icons/mail-junk-symbolic.svg                       | 60 ++++++++++++++++++++++
 .../folder-list/folder-list-folder-entry.vala      |  2 +-
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 icons/mail-junk-symbolic.svg

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index b14903d..7327852 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -18,8 +18,7 @@ set(ICON_FILES
     mail-reply-sender-rtl-symbolic.svg
     mail-sent-symbolic.svg
     mail-sent-rtl-symbolic.svg
-    mail-spam-symbolic.svg
-    mail-spam-rtl-symbolic.svg
+    mail-junk-symbolic.svg
     tag-symbolic.svg
     tag-rtl-symbolic.svg
 )
diff --git a/icons/mail-junk-symbolic.svg b/icons/mail-junk-symbolic.svg
new file mode 100644
index 0000000..c688513
--- /dev/null
+++ b/icons/mail-junk-symbolic.svg
@@ -0,0 +1,60 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="100"
+   height="89.381454"
+   id="svg2"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mail-junk-symbolic.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview9"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="3.3069557"
+     inkscape:cx="43.474945"
+     inkscape:cy="-9.3224306"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><defs
+     id="defs18" /><metadata
+     id="metadata4"><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
+     id="g4149"
+     transform="matrix(0.90918447,0,0,0.90918447,4.5413529,4.5460426)"><path
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bebebe;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8"
+       d="m 93.513729,88.30935 c 2.2322,-0.05154 4.390869,-1.23516 5.602466,-3.30384 1.192145,-2.090518 1.138655,-4.549906 0.07782,-6.529856 L 55.658489,3.1871978 C 54.509448,1.2933507 52.404218,0.01747842 50.017053,0 47.596799,0.01748201 45.491256,1.2933327 44.336644,3.1871978 L 0.80112307,78.475654 c -1.05448128,1.980133 -1.10771731,4.439524 0.0778136,6.529856 1.21814153,2.068626 3.37688403,3.252327 5.60264963,3.30384 l 87.0342747,0" /><g
+       id="g4145"><path
+         d="m 50.912045,61.956644 6.419574,-25.846773 c 0,0 0.277209,-0.759232 0.272338,-1.865699 0.0049,-4.242117 -3.475047,-7.545588 -7.586683,-7.540437 -4.14491,-0.0052 -7.624921,3.29832 -7.625656,7.540437 7.19e-4,1.106447 0.272338,1.865699 0.272338,1.865699 l 6.419571,25.846773 1.828592,0"
+         id="path12"
+         style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero"
+         inkscape:connector-curvature="0" /><path
+         d="m 50.016813,64.949932 c 3.224676,-0.0061 5.852101,2.618714 5.835925,5.869016 0.0162,3.226016 -2.611249,5.850985 -5.835925,5.869014 -3.258133,-0.01814 -5.885559,-2.642998 -5.874897,-5.869014 -0.01068,-3.250302 2.616764,-5.875272 5.874897,-5.869016"
+         id="path14"
+         style="fill:#bebebe;fill-opacity:1;fill-rule:nonzero"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala
index bef1ab9..153f793 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -72,7 +72,7 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
                 return "mail-archive-symbolic";
             
             case Geary.SpecialFolderType.SPAM:
-                return rtl ? "mail-spam-rtl-symbolic" : "mail-spam-symbolic";
+                return "mail-junk-symbolic";
             
             case Geary.SpecialFolderType.TRASH:
                 return "user-trash-symbolic";
-- 
2.7.4