aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--art/16x16/evolution.pngbin0 -> 769 bytes
-rw-r--r--art/22x22/evolution.pngbin0 -> 1132 bytes
-rw-r--r--art/24x24/evolution.pngbin0 -> 1139 bytes
-rw-r--r--art/32x32/evolution.pngbin0 -> 2109 bytes
-rw-r--r--art/48x48/.cvsignore2
-rw-r--r--art/48x48/Makefile.am3
-rw-r--r--art/ChangeLog19
-rw-r--r--art/Makefile.am43
-rw-r--r--art/about-box.pngbin54200 -> 0 bytes
-rw-r--r--art/bcg.pngbin526 -> 0 bytes
-rw-r--r--art/evolution.pngbin5182 -> 0 bytes
-rw-r--r--art/monkey-16.pngbin977 -> 0 bytes
-rw-r--r--art/scalable/evolution.svg615
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/em-format-html-print.c2
-rw-r--r--mail/em-format-html.c27
-rw-r--r--mail/em-format-html.h4
17 files changed, 693 insertions, 32 deletions
diff --git a/art/16x16/evolution.png b/art/16x16/evolution.png
new file mode 100644
index 0000000000..0d1ad3496e
--- /dev/null
+++ b/art/16x16/evolution.png
Binary files differ
diff --git a/art/22x22/evolution.png b/art/22x22/evolution.png
new file mode 100644
index 0000000000..d069ad9c6f
--- /dev/null
+++ b/art/22x22/evolution.png
Binary files differ
diff --git a/art/24x24/evolution.png b/art/24x24/evolution.png
new file mode 100644
index 0000000000..92c2605f91
--- /dev/null
+++ b/art/24x24/evolution.png
Binary files differ
diff --git a/art/32x32/evolution.png b/art/32x32/evolution.png
new file mode 100644
index 0000000000..a24c73d629
--- /dev/null
+++ b/art/32x32/evolution.png
Binary files differ
diff --git a/art/48x48/.cvsignore b/art/48x48/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/art/48x48/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/art/48x48/Makefile.am b/art/48x48/Makefile.am
deleted file mode 100644
index be681b0c2e..0000000000
--- a/art/48x48/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-images48_DATA =
-
-EXTRA_DIST = $(images48_DATA)
diff --git a/art/ChangeLog b/art/ChangeLog
index f56c7de0c1..ce1456c518 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,22 @@
+2007-02-12 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #350253
+
+ * Add new evolution icons:
+ 16x16/evolution.png
+ 22x22/evolution.png
+ 24x24/evolution.png
+ 32x32/evolution.png
+ scalable/evolution.svg
+
+ * Remove obsolete icons:
+ about-box.png
+ bcg.png
+ evolution.png
+ monkey-16.png
+
+ * Makefile.am: Ship our own named icons.
+
2006-09-19 Matthew Barnes <mbarnes@redhat.com>
Fixes bug #356811
diff --git a/art/Makefile.am b/art/Makefile.am
index 08d8048520..575a559c79 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,8 +1,22 @@
+icon16dir = $(datadir)/icons/hicolor/16x16/apps
+icon16_DATA = 16x16/evolution.png
+
+icon22dir = $(datadir)/icons/hicolor/22x22/apps
+icon22_DATA = 22x22/evolution.png
+
+icon24dir = $(datadir)/icons/hicolor/24x24/apps
+icon24_DATA = 24x24/evolution.png
+
+icon32dir = $(datadir)/icons/hicolor/32x32/apps
+icon32_DATA = 32x32/evolution.png
+
+svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicon_DATA = scalable/evolution.svg
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
images_DATA = \
- about-box.png \
- bcg.png \
evolution-contacts-mini.png \
- monkey-16.png \
offline.png \
online.png \
world_map-960.png \
@@ -10,15 +24,14 @@ images_DATA = \
plus.png \
minus.png
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
- $(INSTALL_DATA) $(srcdir)/evolution.png $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-if DEFAULT_BINARY
- cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
-endif
-
-uninstall-local:
- rm -f $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
EXTRA_DIST = \
ChangeLog \
@@ -27,6 +40,10 @@ EXTRA_DIST = \
broken-image-16.xpm \
broken-image-24.xpm \
empty.xpm \
- evolution.png \
jump.xpm \
+ $(icon16_DATA) \
+ $(icon22_DATA) \
+ $(icon24_DATA) \
+ $(icon32_DATA) \
+ $(svgicon_DATA) \
$(images_DATA)
diff --git a/art/about-box.png b/art/about-box.png
deleted file mode 100644
index c3613fb4bb..0000000000
--- a/art/about-box.png
+++ /dev/null
Binary files differ
diff --git a/art/bcg.png b/art/bcg.png
deleted file mode 100644
index ec03f8ab6e..0000000000
--- a/art/bcg.png
+++ /dev/null
Binary files differ
diff --git a/art/evolution.png b/art/evolution.png
deleted file mode 100644
index 412dcfbbc0..0000000000
--- a/art/evolution.png
+++ /dev/null
Binary files differ
diff --git a/art/monkey-16.png b/art/monkey-16.png
deleted file mode 100644
index 02fb7b6eb5..0000000000
--- a/art/monkey-16.png
+++ /dev/null
Binary files differ
diff --git a/art/scalable/evolution.svg b/art/scalable/evolution.svg
new file mode 100644
index 0000000000..d44c9b319a
--- /dev/null
+++ b/art/scalable/evolution.svg
@@ -0,0 +1,615 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ 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"
+ inkscape:export-ydpi="562.50000"
+ inkscape:export-xdpi="562.50000"
+ inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/logos/evolution/logo-simplified.png"
+ sodipodi:docbase="/home/jimmac/ximian_art/icons/application-icons/evolution/scalable"
+ sodipodi:docname="evolution.svg"
+ inkscape:version="0.44"
+ sodipodi:version="0.32"
+ id="svg6850"
+ xml:space="preserve"
+ viewBox="0 0 48 48"
+ height="48.000000px"
+ width="48.000000px"><metadata
+ id="metadata7234">
+ <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>Evolution 2.2 Logo</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+</metadata>
+<defs
+ id="defs7232"><radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" /><linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060"><stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" /><stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" /></linearGradient><radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" /><linearGradient
+ id="linearGradient5048"><stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" /><stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" /><stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" /></linearGradient><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" /><linearGradient
+ id="linearGradient10691"
+ inkscape:collect="always">
+ <stop
+ id="stop10693"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop10695"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+</linearGradient><linearGradient
+ id="linearGradient10653">
+ <stop
+ id="stop10655"
+ offset="0.0000000"
+ style="stop-color:#f3f4ff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop10657"
+ offset="1.0000000"
+ style="stop-color:#9193af;stop-opacity:1.0000000;" />
+</linearGradient><linearGradient
+ id="linearGradient2111">
+ <stop
+ id="stop2113"
+ offset="0.0000000"
+ style="stop-color:#838383;stop-opacity:1.0000000;" />
+ <stop
+ id="stop2115"
+ offset="1.0000000"
+ style="stop-color:#000000;stop-opacity:1.0000000;" />
+</linearGradient><linearGradient
+ id="linearGradient42174">
+ <stop
+ id="stop42176"
+ offset="0.0000000"
+ style="stop-color:#a0a0a0;stop-opacity:1.0000000;" />
+ <stop
+ id="stop42178"
+ offset="1.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+</linearGradient><linearGradient
+ id="linearGradient2145">
+ <stop
+ id="stop2147"
+ offset="0.0000000"
+ style="stop-color:#fffffd;stop-opacity:1.0000000;" />
+ <stop
+ id="stop2149"
+ offset="1.0000000"
+ style="stop-color:#cbcbc9;stop-opacity:1.0000000;" />
+</linearGradient><linearGradient
+ id="linearGradient37935">
+ <stop
+ style="stop-color:#9497b3;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop37937" />
+ <stop
+ style="stop-color:#4c4059;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop37939" />
+</linearGradient><linearGradient
+ id="linearGradient2136">
+ <stop
+ style="stop-color:#989690;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop2138" />
+ <stop
+ style="stop-color:#656460;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2140" />
+</linearGradient><linearGradient
+ id="linearGradient15107">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop15109" />
+ <stop
+ style="stop-color:#e2e2e2;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop15111" />
+</linearGradient><linearGradient
+ id="linearGradient18913">
+ <stop
+ style="stop-color:#ededed;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop18915" />
+ <stop
+ style="stop-color:#c8c8c8;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop18917" />
+</linearGradient><linearGradient
+ id="linearGradient2166">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2168" />
+ <stop
+ style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2170" />
+</linearGradient><linearGradient
+ id="linearGradient2152">
+ <stop
+ style="stop-color:#9aa29a;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop2154" />
+ <stop
+ style="stop-color:#b5beb5;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2156" />
+</linearGradient><linearGradient
+ id="linearGradient9749">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop9751" />
+ <stop
+ style="stop-color:#ededed;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop9753" />
+</linearGradient><linearGradient
+ id="linearGradient2274">
+ <stop
+ style="stop-color:#000000;stop-opacity:0.12871288;"
+ offset="0.0000000"
+ id="stop2276" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop2278" />
+</linearGradient><radialGradient
+ r="7.2284161"
+ fy="73.615714"
+ fx="6.7027131"
+ cy="73.615714"
+ cx="6.7027131"
+ gradientTransform="scale(1.902215,0.525703)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient11380"
+ xlink:href="#linearGradient10691"
+ inkscape:collect="always" /><linearGradient
+ y2="52.090678"
+ x2="9.8855033"
+ y1="37.197018"
+ x1="8.9156475"
+ gradientTransform="matrix(1.537475,0.000000,0.000000,0.477257,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11384"
+ xlink:href="#linearGradient2152"
+ inkscape:collect="always" /><radialGradient
+ r="29.889715"
+ fy="6.8283234"
+ fx="8.7468252"
+ cy="6.8283234"
+ cx="8.7468252"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient11386"
+ xlink:href="#linearGradient37935"
+ inkscape:collect="always" /><radialGradient
+ r="29.292715"
+ fy="10.045444"
+ fx="11.901996"
+ cy="10.045444"
+ cx="11.901996"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient11388"
+ xlink:href="#linearGradient2145"
+ inkscape:collect="always" /><linearGradient
+ y2="25.884274"
+ x2="22.218424"
+ y1="7.7893324"
+ x1="6.3422160"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11390"
+ xlink:href="#linearGradient42174"
+ inkscape:collect="always" /><linearGradient
+ y2="17.322744"
+ x2="19.359052"
+ y1="8.3119216"
+ x1="13.037439"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11392"
+ xlink:href="#linearGradient2111"
+ inkscape:collect="always" /><linearGradient
+ y2="7.4232451"
+ x2="19.359052"
+ y1="-1.5875777"
+ x1="13.037439"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11394"
+ xlink:href="#linearGradient2111"
+ inkscape:collect="always" /><linearGradient
+ y2="12.372997"
+ x2="24.308804"
+ y1="3.3621745"
+ x1="17.987192"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11396"
+ xlink:href="#linearGradient2111"
+ inkscape:collect="always" /><linearGradient
+ y2="12.372997"
+ x2="14.409305"
+ y1="3.3621745"
+ x1="8.0876926"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11398"
+ xlink:href="#linearGradient2111"
+ inkscape:collect="always" /><radialGradient
+ r="15.532059"
+ fy="10.583970"
+ fx="11.329200"
+ cy="10.583970"
+ cx="11.329200"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient11400"
+ xlink:href="#linearGradient10653"
+ inkscape:collect="always" /><linearGradient
+ y2="26.022910"
+ x2="18.475286"
+ y1="4.7461626"
+ x1="11.572842"
+ gradientTransform="matrix(0.841443,0.000000,0.000000,0.872040,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11402"
+ xlink:href="#linearGradient15107"
+ inkscape:collect="always" /><linearGradient
+ y2="15.257116"
+ x2="30.599684"
+ y1="15.257116"
+ x1="2.0618774"
+ gradientTransform="matrix(0.841443,0.000000,0.000000,0.872040,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11404"
+ xlink:href="#linearGradient2136"
+ inkscape:collect="always" /><linearGradient
+ y2="17.876846"
+ x2="13.467486"
+ y1="7.2310905"
+ x1="5.8266134"
+ gradientTransform="matrix(0.983700,0.000000,0.000000,0.745930,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11406"
+ xlink:href="#linearGradient18913"
+ inkscape:collect="always" /><linearGradient
+ y2="29.568739"
+ x2="15.310744"
+ y1="15.148383"
+ x1="10.184240"
+ gradientTransform="matrix(1.139440,0.000000,0.000000,0.643976,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11408"
+ xlink:href="#linearGradient2166"
+ inkscape:collect="always" /><linearGradient
+ y2="52.090678"
+ x2="9.8855033"
+ y1="37.197018"
+ x1="8.9156475"
+ gradientTransform="matrix(1.537475,0.000000,0.000000,0.477257,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11410"
+ xlink:href="#linearGradient2152"
+ inkscape:collect="always" /><linearGradient
+ y2="52.090678"
+ x2="9.8855033"
+ y1="37.197018"
+ x1="8.9156475"
+ gradientTransform="matrix(1.537475,0.000000,0.000000,0.477257,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11412"
+ xlink:href="#linearGradient2152"
+ inkscape:collect="always" /><linearGradient
+ y2="24.132717"
+ x2="21.111549"
+ y1="13.686079"
+ x1="11.233107"
+ gradientTransform="matrix(0.841423,0.000000,0.000000,0.872061,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11414"
+ xlink:href="#linearGradient9749"
+ inkscape:collect="always" /><linearGradient
+ y2="32.203162"
+ x2="9.7619219"
+ y1="37.784682"
+ x1="8.7803760"
+ gradientTransform="matrix(1.499970,0.000000,0.000000,0.489191,4.995766,7.023296)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient11416"
+ xlink:href="#linearGradient2274"
+ inkscape:collect="always" /></defs>
+<sodipodi:namedview
+ inkscape:current-layer="svg6850"
+ inkscape:window-y="285"
+ inkscape:window-x="797"
+ inkscape:cy="-23.626349"
+ inkscape:cx="-2.3310969"
+ inkscape:zoom="1"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666"
+ borderopacity="0.19215686"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="810"
+ inkscape:window-height="756"
+ inkscape:showpageshadow="false" />
+
+
+
+<g
+ style="opacity:0.84924622;display:inline"
+ id="g5022"
+ transform="matrix(1.862297e-2,0,0,1.725413e-2,35.68893,33.51623)"><rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" /></g><g
+ transform="matrix(1.340124,0.000000,0.000000,1.340124,-5.069189,-7.603523)"
+ id="g11365">
+
+ <path
+ sodipodi:nodetypes="ccczzzz"
+ id="path12723"
+ d="M 7.1590246,17.268457 L 7.1590246,32.342866 L 30.315345,32.342866 L 30.277104,17.340791 C 30.274944,16.493516 22.856169,8.3133557 21.487587,8.3133557 L 16.131633,8.3133557 C 14.692780,8.3133557 7.1590246,16.469949 7.1590246,17.268457 z "
+ style="fill:url(#linearGradient11402);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient11404);stroke-width:0.63919783;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="czzzccz"
+ id="path18153"
+ d="M 7.5283144,17.322538 C 7.2790156,17.053141 14.973303,8.7460064 16.136529,8.7460064 L 21.382419,8.7460064 C 22.476901,8.7460064 30.173802,16.968355 29.792068,17.442699 L 22.989485,25.895614 L 15.277322,25.696255 L 7.5283144,17.322538 z "
+ style="fill:url(#linearGradient11406);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path2164"
+ d="M 15.140883,25.609036 L 10.548087,20.131253 L 26.092325,15.787062 L 27.933079,19.567475 L 23.344669,25.593195"
+ style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path2162"
+ d="M 14.648745,25.495465 L 9.9622552,19.977529 L 25.399420,15.660107 L 27.387403,19.587749 L 22.852531,25.479625"
+ style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path2160"
+ d="M 14.951599,25.571179 L 10.144651,20.146934 L 25.782581,15.722436 L 27.783949,19.757154 L 23.155385,25.555339"
+ style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path15105"
+ d="M 14.838029,25.874033 L 10.245231,20.396250 L 25.722548,16.078828 L 27.576687,19.966317 L 23.041815,25.858193"
+ style="fill:url(#linearGradient11408);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path14245"
+ d="M 16.024558,25.011992 L 7.6344188,31.883951 L 16.345784,25.868597 L 21.994022,25.868597 L 29.772300,31.807469 L 22.342018,25.011992 L 16.024558,25.011992 z "
+ style="fill:url(#linearGradient11410);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path14339"
+ d="M 7.5536271,17.383943 L 14.766419,26.350437 L 15.435642,25.815059 L 7.5536271,17.383943 z "
+ style="color:#000000;fill:url(#linearGradient11412);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="ccczzzz"
+ id="path15103"
+ d="M 7.9888230,17.456080 L 8.0079435,31.476031 L 29.455714,31.476031 L 29.417473,17.532245 C 29.416231,17.079773 22.533327,9.1977577 21.202815,9.1977577 L 16.356766,9.1977577 C 14.974412,9.1977577 7.9881805,16.984733 7.9888230,17.456080 z "
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:url(#linearGradient11414);stroke-width:0.63919765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path17393"
+ d="M 16.318200,25.881574 L 8.8390193,31.061763 L 10.229091,31.065588 L 16.491101,26.763444 L 22.016424,25.872295 L 16.318200,25.881574 z "
+ style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path2174"
+ d="M 10.349551,20.380972 L 11.179387,21.264346 L 25.453706,16.952651 L 27.185286,20.398556 L 27.588722,19.952670 L 25.741668,16.071180 L 10.349551,20.380972 z "
+ style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path2272"
+ d="M 11.527382,21.612342 L 15.301797,25.654446 L 16.051327,25.011992 L 22.368787,25.038761 L 22.877396,25.493832 L 25.366904,22.522484 C 24.644144,21.639111 11.527382,21.612342 11.527382,21.612342 z "
+ style="fill:url(#linearGradient11416);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+</g>
+<g
+ transform="matrix(1.322987,0.000000,0.000000,1.322987,-11.92710,-6.319547)"
+ id="g11350">
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path14341"
+ d="M 29.838359,17.358300 L 22.770321,25.574139 L 23.389829,26.186000 L 29.838359,17.358300 z "
+ style="color:#000000;fill:url(#linearGradient11384);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path18921"
+ d="M 29.779094,17.314041 L 23.476009,26.054476 L 24.376455,26.849486 L 29.779094,17.314041 z "
+ style="fill:#fefefe;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.57541901;color:#000000;fill:url(#radialGradient11380);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+ id="path10689"
+ sodipodi:cx="12.750000"
+ sodipodi:cy="38.700001"
+ sodipodi:rx="13.750000"
+ sodipodi:ry="3.8000000"
+ d="M 26.500000 38.700001 A 13.750000 3.8000000 0 1 1 -1.0000000,38.700001 A 13.750000 3.8000000 0 1 1 26.500000 38.700001 z"
+ transform="matrix(0.900000,0.000000,0.000000,1.000000,21.10000,-2.000000)" />
+ <path
+ transform="matrix(0.704562,0.000000,0.000000,0.704562,20.97029,15.85306)"
+ d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z"
+ sodipodi:ry="14.910714"
+ sodipodi:rx="14.910714"
+ sodipodi:cy="16.910715"
+ sodipodi:cx="16.250000"
+ id="path27786"
+ style="fill:url(#radialGradient11386);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#605773;stroke-width:1.0728160;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.521637,0.000000,0.000000,0.521637,23.89626,18.89987)"
+ d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z"
+ sodipodi:ry="14.910714"
+ sodipodi:rx="14.910714"
+ sodipodi:cy="16.910715"
+ sodipodi:cx="16.250000"
+ id="path35549"
+ style="fill:url(#radialGradient11388);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient11390);stroke-width:1.1997213;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.892680,0.000000,0.000000,0.892680,18.74719,12.22636)"
+ d="M 16.406250 17.281250 A 1.2187500 1.2187500 0 1 1 13.968750,17.281250 A 1.2187500 1.2187500 0 1 1 16.406250 17.281250 z"
+ sodipodi:ry="1.2187500"
+ sodipodi:rx="1.2187500"
+ sodipodi:cy="17.281250"
+ sodipodi:cx="15.187500"
+ id="path34778"
+ style="fill:#f3f3f3;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.70105666;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ id="path35559"
+ d="M 31.823046,26.547610 L 29.751878,21.917149"
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.62581909;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+ <path
+ id="path35561"
+ d="M 29.604314,31.540403 L 31.525753,28.768529"
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.93872845;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+ sodipodi:nodetypes="cc" />
+ <path
+ transform="matrix(1.189172,0.000000,0.000000,1.189172,12.45482,12.63401)"
+ d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.086680,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z"
+ sodipodi:ry="0.61871845"
+ sodipodi:rx="0.61871845"
+ sodipodi:cy="7.6932044"
+ sodipodi:cx="16.705399"
+ id="path35563"
+ style="fill:url(#linearGradient11392);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.3687184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.189172,0.000000,0.000000,1.189172,12.45482,24.40622)"
+ d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.086680,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z"
+ sodipodi:ry="0.61871845"
+ sodipodi:rx="0.61871845"
+ sodipodi:cy="7.6932044"
+ sodipodi:cx="16.705399"
+ id="path35565"
+ style="fill:url(#linearGradient11394);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.3687184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.189172,0.000000,0.000000,1.189172,6.568712,18.52011)"
+ d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.086680,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z"
+ sodipodi:ry="0.61871845"
+ sodipodi:rx="0.61871845"
+ sodipodi:cy="7.6932044"
+ sodipodi:cx="16.705399"
+ id="path35567"
+ style="fill:url(#linearGradient11396);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.3687184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(1.189172,0.000000,0.000000,1.189172,18.34092,18.52011)"
+ d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.086680,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z"
+ sodipodi:ry="0.61871845"
+ sodipodi:rx="0.61871845"
+ sodipodi:cy="7.6932044"
+ sodipodi:cx="16.705399"
+ id="path35569"
+ style="fill:url(#linearGradient11398);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.3687184;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#radialGradient11400);stroke-width:1.1458347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ id="path10651"
+ sodipodi:cx="16.250000"
+ sodipodi:cy="16.910715"
+ sodipodi:rx="14.910714"
+ sodipodi:ry="14.910714"
+ d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z"
+ transform="matrix(0.659664,0.000000,0.000000,0.659664,21.69988,16.61232)" />
+</g>
+</svg> \ No newline at end of file
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8322bec8be..97aa1328aa 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-12 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #350253
+
+ * em-format-html-print.h:
+ Rename show_rupert field to show_icon.
+
+ * em-format-html-print.c (efh_format_headers):
+ Lookup the evolution icon by name.
+
2007-02-12 Kjartan Maraas <kmaraas@gnome.org>
* em-folder-browser.c: (emfb_search_search_activated):
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index a527ded879..bc94f8aae5 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -56,7 +56,7 @@ efhp_init(GObject *o)
efhp->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_add((GtkContainer *)efhp->window, html);
gtk_widget_realize(html);
- efhp->formathtml.show_rupert = FALSE;
+ efhp->formathtml.show_icon = FALSE;
}
static void
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index dc55d03134..603ec21044 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -32,6 +32,7 @@
#include <ctype.h>
#include <glib.h>
+#include <gtk/gtk.h>
#ifdef G_OS_WIN32
/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
#define DATADIR crap_DATADIR
@@ -156,7 +157,7 @@ efh_init(GObject *o)
efh->content_colour = 0xffffff;
efh->text_html_flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
| CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
- efh->show_rupert = TRUE;
+ efh->show_icon = TRUE;
}
static void
@@ -1747,7 +1748,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
const char *charset;
CamelContentType *ct;
struct _camel_header_raw *header;
- int rupert = FALSE;
+ gboolean have_icon = FALSE;
ct = camel_mime_part_get_content_type((CamelMimePart *)part);
charset = camel_content_type_param (ct, "charset");
@@ -1788,7 +1789,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
if (strstr(header->value, "Evolution"))
- rupert = TRUE;
+ have_icon = TRUE;
} else if (!g_ascii_strcasecmp (header->name, h->name)) {
efh_format_header(emf, stream, part, header, h->flags, charset);
}
@@ -1801,19 +1802,23 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
if (!efh->simple_headers) {
camel_stream_printf(stream, "</table></td>");
- if (rupert && efh->show_rupert) {
+ if (have_icon && efh->show_icon) {
+ GtkIconInfo *icon_info;
char *classid;
- CamelMimePart *iconpart;
- char *pngfile;
+ CamelMimePart *iconpart = NULL;
classid = g_strdup_printf("icon:///em-format-html/%s/icon/header", emf->part_id->str);
camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=16 height=16 src=\"%s\"></td>", classid);
- pngfile = g_build_filename (EVOLUTION_ICONSDIR,
- "monkey-16.png",
- NULL);
- iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", pngfile);
- g_free (pngfile);
+ icon_info = gtk_icon_theme_lookup_icon (
+ gtk_icon_theme_get_default (),
+ "evolution", 16, GTK_ICON_LOOKUP_NO_SVG);
+ if (icon_info != NULL) {
+ iconpart = em_format_html_file_part (
+ (EMFormatHTML *) emf, "image/png",
+ gtk_icon_info_get_filename (icon_info));
+ gtk_icon_info_free (icon_info);
+ }
if (iconpart) {
em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 383313b3bf..1f589755b9 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -162,7 +162,7 @@ struct _EMFormatHTMLPObject {
* @mark_citations:1:
* @simple_headers:1:
* @hide_headers:1:
- * @show_rupert:1:
+ * @show_icon:1:
*
* Most of these fields are private or read-only.
*
@@ -192,7 +192,7 @@ struct _EMFormatHTML {
unsigned int mark_citations:1;
unsigned int simple_headers:1; /* simple header format, no box/table */
unsigned int hide_headers:1; /* no headers at all */
- unsigned int show_rupert:1; /* whether we print rupert or not */
+ unsigned int show_icon:1; /* show an icon when the sender used Evo */
guint32 header_wrap_flags;
};
generated by cgit (git 2.34.1) at 2024-11-12 05:38:25 +0800