Updating branch refs/heads/master
to f3d14ad454979b92f0c4b6deacd9d9bdb1a356a3 (commit)
from b0ad0f735823bdf2e7d115f511c042da6c74ff9d (commit)
commit f3d14ad454979b92f0c4b6deacd9d9bdb1a356a3
Author: Florian Rivoal <[email protected]>
Date: Thu Dec 30 03:16:25 2010 +0900
Remove the scalable icon, since it isn't real
Addresses bug #2458
configure.ac.in | 1 -
icons/Makefile.am | 3 +-
icons/scalable/Makefile.am | 7 -----
icons/scalable/cpu.svg | 53 --------------------------------------------
4 files changed, 1 insertions(+), 63 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index f21d6bb..9a76f75 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -41,6 +41,5 @@ icons/Makefile
icons/16x16/Makefile
icons/22x22/Makefile
icons/48x48/Makefile
-icons/scalable/Makefile
po/Makefile.in
])
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 7d914de..bfbc934 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,8 +1,7 @@
SUBDIRS = \
16x16 \
22x22 \
- 48x48 \
- scalable
+ 48x48
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
deleted file mode 100644
index ff54802..0000000
--- a/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-
-icons_DATA = \
- cpu.svg
-
-EXTRA_DIST = \
- $(icons_DATA)
diff --git a/icons/scalable/cpu.svg b/icons/scalable/cpu.svg
deleted file mode 100644
index 2066369..0000000
--- a/icons/scalable/cpu.svg
+++ /dev/null
@@ -1,53 +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://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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.43"
- width="210mm"
- height="297mm"
- sodipodi:docbase="/home/shrek/code/cpu-freq-plugin/icons/scalable"
- sodipodi:docname="cpu.svg">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5" />
- <sodipodi:namedview
- inkscape:window-height="584"
- inkscape:window-width="872"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="0.38294801"
- inkscape:cx="372.04724"
- inkscape:cy="526.18109"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:current-layer="svg2" />
- <image
- xlink:href="cpu.png"
- sodipodi:absref="cpu.png"
- width="48"
- height="48"
- id="image9" />
-</svg>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
