summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-01-27 01:12:17 +0100
committerStefano Karapetsas <[email protected]>2012-01-27 01:12:17 +0100
commit8bc57d44c30deaf7529c4733205eeccd373d62d9 (patch)
tree5e216303d7abbfb05c0702604c2d58894d2a4507
parent022106354aff7cabceed8a5fe48d7a0b6a303115 (diff)
downloadmate-applets-8bc57d44c30deaf7529c4733205eeccd373d62d9.tar.bz2
mate-applets-8bc57d44c30deaf7529c4733205eeccd373d62d9.tar.xz
fix conflict with gnome-applets
-rw-r--r--invest-applet/data/Invest_Applet.server.in.in2
-rw-r--r--invest-applet/data/art/Makefile.am2
-rw-r--r--invest-applet/data/art/mate-invest-applet.16.png (renamed from invest-applet/data/art/invest-applet.16.png)bin566 -> 566 bytes
-rw-r--r--invest-applet/data/art/mate-invest-applet.22.png (renamed from invest-applet/data/art/invest-applet.22.png)bin795 -> 795 bytes
-rw-r--r--invest-applet/data/art/mate-invest-applet.48.png (renamed from invest-applet/data/art/invest-applet.48.png)bin1864 -> 1864 bytes
-rw-r--r--invest-applet/data/art/mate-invest-applet.svg (renamed from invest-applet/data/art/invest-applet.svg)0
6 files changed, 2 insertions, 2 deletions
diff --git a/invest-applet/data/Invest_Applet.server.in.in b/invest-applet/data/Invest_Applet.server.in.in
index b2861c28..fe4c6da5 100644
--- a/invest-applet/data/Invest_Applet.server.in.in
+++ b/invest-applet/data/Invest_Applet.server.in.in
@@ -19,7 +19,7 @@
<oaf_attribute name="name" type="string" _value="Invest"/>
<oaf_attribute name="description" type="string" _value="Track your invested money."/>
<oaf_attribute name="panel:category" type="string" value="Accessories"/>
- <oaf_attribute name="panel:icon" type="string" value="invest-applet"/>
+ <oaf_attribute name="panel:icon" type="string" value="mate-invest-applet"/>
</oaf_server>
</oaf_info>
diff --git a/invest-applet/data/art/Makefile.am b/invest-applet/data/art/Makefile.am
index 7f304f4a..1a5585e5 100644
--- a/invest-applet/data/art/Makefile.am
+++ b/invest-applet/data/art/Makefile.am
@@ -1,7 +1,7 @@
# ******************************************************************************
# Images and icon
# ******************************************************************************
-icons = invest-applet.16.png invest-applet.22.png invest-applet.48.png invest-applet.svg
+icons = mate-invest-applet.16.png mate-invest-applet.22.png mate-invest-applet.48.png mate-invest-applet.svg
artdir = $(pkgdatadir)/invest-applet
art_DATA = invest-16_neutral.png invest-22_neutral.png invest_neutral.svg \
diff --git a/invest-applet/data/art/invest-applet.16.png b/invest-applet/data/art/mate-invest-applet.16.png
index c5d6f815..c5d6f815 100644
--- a/invest-applet/data/art/invest-applet.16.png
+++ b/invest-applet/data/art/mate-invest-applet.16.png
Binary files differ
diff --git a/invest-applet/data/art/invest-applet.22.png b/invest-applet/data/art/mate-invest-applet.22.png
index eba0caff..eba0caff 100644
--- a/invest-applet/data/art/invest-applet.22.png
+++ b/invest-applet/data/art/mate-invest-applet.22.png
Binary files differ
diff --git a/invest-applet/data/art/invest-applet.48.png b/invest-applet/data/art/mate-invest-applet.48.png
index 14e2f9ec..14e2f9ec 100644
--- a/invest-applet/data/art/invest-applet.48.png
+++ b/invest-applet/data/art/mate-invest-applet.48.png
Binary files differ
diff --git a/invest-applet/data/art/invest-applet.svg b/invest-applet/data/art/mate-invest-applet.svg
index b5808216..b5808216 100644
--- a/invest-applet/data/art/invest-applet.svg
+++ b/invest-applet/data/art/mate-invest-applet.svg