solved some conflicts with sensors-applet

10 files changed, 11 insertions, 11 deletions

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 8ff4d4e..7c4afc2 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,4 +1,4 @@
-pixmapsdir = $(datadir)/pixmaps/sensors-applet
+pixmapsdir = $(datadir)/pixmaps/mate-sensors-applet
 pixmaps_DATA = \
 	very-low-temp-icon.png \
 	low-temp-icon.png \
@@ -8,17 +8,17 @@ pixmaps_DATA = \
 
 deviceiconsdir = $(datadir)/icons/hicolor/22x22/devices
 deviceicons_DATA = \
-	sensors-applet-battery.png \
-	sensors-applet-case.png \
-	sensors-applet-chip.png \
-	sensors-applet-cpu.png \
-	sensors-applet-gpu.png \
-	sensors-applet-fan.png \
-	sensors-applet-drive-harddisk.png \
-	sensors-applet-memory.png
+	mate-sensors-applet-battery.png \
+	mate-sensors-applet-case.png \
+	mate-sensors-applet-chip.png \
+	mate-sensors-applet-cpu.png \
+	mate-sensors-applet-gpu.png \
+	mate-sensors-applet-fan.png \
+	mate-sensors-applet-drive-harddisk.png \
+	mate-sensors-applet-memory.png
 
 appicondir = $(datadir)/icons/hicolor/48x48/apps
-appicon_DATA = sensors-applet.png
+appicon_DATA = mate-sensors-applet.png
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
@@ -36,4 +36,4 @@ update_icon_cache:
 EXTRA_DIST = \
 	$(pixmaps_DATA) \
 	$(deviceicons_DATA) \
-	$(appicon_DATA)
\ No newline at end of file
+	$(appicon_DATA)
diff --git a/pixmaps/sensors-applet-battery.png b/pixmaps/mate-sensors-applet-battery.png
index d49e6c8..d49e6c8 100644
--- a/pixmaps/sensors-applet-battery.png
+++ b/pixmaps/mate-sensors-applet-battery.png
diff --git a/pixmaps/sensors-applet-case.png b/pixmaps/mate-sensors-applet-case.png
index 8cca2b7..8cca2b7 100644
--- a/pixmaps/sensors-applet-case.png
+++ b/pixmaps/mate-sensors-applet-case.png
diff --git a/pixmaps/sensors-applet-chip.png b/pixmaps/mate-sensors-applet-chip.png
index 2829ac8..2829ac8 100644
--- a/pixmaps/sensors-applet-chip.png
+++ b/pixmaps/mate-sensors-applet-chip.png
diff --git a/pixmaps/sensors-applet-cpu.png b/pixmaps/mate-sensors-applet-cpu.png
index 0a04039..0a04039 100644
--- a/pixmaps/sensors-applet-cpu.png
+++ b/pixmaps/mate-sensors-applet-cpu.png
diff --git a/pixmaps/sensors-applet-drive-harddisk.png b/pixmaps/mate-sensors-applet-drive-harddisk.png
index 648bcc2..648bcc2 100644
--- a/pixmaps/sensors-applet-drive-harddisk.png
+++ b/pixmaps/mate-sensors-applet-drive-harddisk.png
diff --git a/pixmaps/sensors-applet-fan.png b/pixmaps/mate-sensors-applet-fan.png
index 36a0da9..36a0da9 100644
--- a/pixmaps/sensors-applet-fan.png
+++ b/pixmaps/mate-sensors-applet-fan.png
diff --git a/pixmaps/sensors-applet-gpu.png b/pixmaps/mate-sensors-applet-gpu.png
index 9fc9463..9fc9463 100644
--- a/pixmaps/sensors-applet-gpu.png
+++ b/pixmaps/mate-sensors-applet-gpu.png
diff --git a/pixmaps/sensors-applet-memory.png b/pixmaps/mate-sensors-applet-memory.png
index 446f84a..446f84a 100644
--- a/pixmaps/sensors-applet-memory.png
+++ b/pixmaps/mate-sensors-applet-memory.png
diff --git a/pixmaps/sensors-applet.png b/pixmaps/mate-sensors-applet.png
index a4bcd4e..908dce9 100644
--- a/pixmaps/sensors-applet.png
+++ b/pixmaps/mate-sensors-applet.png