36 files changed, 72 insertions, 71 deletions
diff --git a/configure b/configure
index 513b455..d06a3a5 100755
--- a/configure
+++ b/configure
@@ -2920,7 +2920,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='sensors-applet'
+ PACKAGE='mate-sensors-applet'
 VERSION='2.2.7'
 
 
diff --git a/configure.ac b/configure.ac
index be6cded..9c78a0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_PROG_LIBTOOL
 
 # =========== take care of some localization ========= #
 AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
-GETTEXT_PACKAGE=sensors-applet
+GETTEXT_PACKAGE=mate-sensors-applet
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
 AC_SUBST(GETTEXT_PACKAGE)
 ALL_LINGUAS="cs de es fi fr hu it pl pt_BR ro ru sv zh_CN"
diff --git a/debian/control b/debian/control
index 15dbf48..d165cad 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Stefano Karapetsas <[email protected]>
 Build-Depends:
 autoconf,
 automake,
- debhelper,
+ debhelper (>= 8),
 docbook-xml,
 mate-common,
 mate-doc-utils,
diff --git a/debian/libmatesensorsappletplugin-dev.install b/debian/libmatesensorsappletplugin-dev.install
index 0c425cc..75ce701 100644
--- a/debian/libmatesensorsappletplugin-dev.install
+++ b/debian/libmatesensorsappletplugin-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/sensors-applet
-debian/tmp/usr/lib/libsensors-applet-plugin.a
-debian/tmp/usr/lib/libsensors-applet-plugin.la
-debian/tmp/usr/lib/libsensors-applet-plugin.so
+usr/include/mate-sensors-applet
+usr/lib/libmate-sensors-applet-plugin.a
+usr/lib/libmate-sensors-applet-plugin.la
+usr/lib/libmate-sensors-applet-plugin.so
diff --git a/debian/libmatesensorsappletplugin.install b/debian/libmatesensorsappletplugin.install
index 77b822b..83b35a8 100644
--- a/debian/libmatesensorsappletplugin.install
+++ b/debian/libmatesensorsappletplugin.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libsensors-applet-plugin.so.0
-debian/tmp/usr/lib/libsensors-applet-plugin.so.0.0.0
+usr/lib/libmate-sensors-applet-plugin.so.0
+usr/lib/libmate-sensors-applet-plugin.so.0.0.0
diff --git a/debian/mate-sensors-applet.install b/debian/mate-sensors-applet.install
index a25dd1a..20ebc16 100644
--- a/debian/mate-sensors-applet.install
+++ b/debian/mate-sensors-applet.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/matecomponent
-debian/tmp/usr/lib/mate-panel
-debian/tmp/usr/lib/sensors-applet/plugins/*.so
-debian/tmp/usr/share
+usr/lib/matecomponent
+usr/lib/mate-panel
+usr/lib/mate-sensors-applet/plugins/*.so
+usr/share
diff --git a/debian/rules b/debian/rules
index 975ae04..e725e4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # prevent 'installed' schemas from being registered on the build machine
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL := 1
+export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL := 1
 
 # detect cross-compiling and configure build appropriately
 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -14,7 +14,7 @@ endif
 
 # standard install directories
 confflags += --prefix=/usr
-confflags += --libexecdir="\$${prefix}/lib/gnome-panel"
+confflags += --libexecdir="\$${prefix}/lib/mate-panel"
 
 # rebuild everything
 confflags += --enable-maintainer-mode
@@ -56,4 +56,4 @@ override_dh_auto_configure:
 gnome-autogen.sh $(confflags)
 
 override_dh_makeshlibs:
- dh_makeshlibs --exclude=/usr/lib/sensors-applet/plugins/
+ dh_makeshlibs --exclude=/usr/lib/mate-sensors-applet/plugins/
diff --git a/help/Makefile.am b/help/Makefile.am
index 54fb549..d6dac70 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/mate-doc-utils.make
 dist-hook: doc-dist-hook
 
-DOC_MODULE = sensors-applet
+DOC_MODULE = mate-sensors-applet
 DOC_ENTITIES = legal.xml
 DOC_FIGURES = figures/applet_in_panel.png
 DOC_INCLUDES = 
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
diff --git a/plugins/acpi/Makefile.am b/plugins/acpi/Makefile.am
index 549e880..4bcdaba 100644
--- a/plugins/acpi/Makefile.am
+++ b/plugins/acpi/Makefile.am
@@ -1,5 +1,5 @@
 # ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libacpi_la_SOURCES = \
 acpi-plugin.c
 
 libacpi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libacpi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libacpi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/aticonfig/Makefile.am b/plugins/aticonfig/Makefile.am
index c9d736e..4735796 100644
--- a/plugins/aticonfig/Makefile.am
+++ b/plugins/aticonfig/Makefile.am
@@ -1,5 +1,5 @@
 # ATICONFIG plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libaticonfig_la_SOURCES = \
 aticonfig-plugin.c
 
 libaticonfig_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) 
-libaticonfig_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libaticonfig_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/eee/Makefile.am b/plugins/eee/Makefile.am
index 32cc8e8..1845684 100644
--- a/plugins/eee/Makefile.am
+++ b/plugins/eee/Makefile.am
@@ -1,5 +1,5 @@
 # ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libeee_la_SOURCES = \
 eee-plugin.c
 
 libeee_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libeee_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libeee_la_LIBADD = $(top_builddir)/lib/libmatesensors-applet-plugin.la
diff --git a/plugins/hddtemp/Makefile.am b/plugins/hddtemp/Makefile.am
index 579effe..69472e7 100644
--- a/plugins/hddtemp/Makefile.am
+++ b/plugins/hddtemp/Makefile.am
@@ -1,5 +1,5 @@
 # HDDTEMP plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libhddtemp_la_SOURCES = \
 hddtemp-plugin.c
 
 libhddtemp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libhddtemp_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libhddtemp_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/i2c-proc/Makefile.am b/plugins/i2c-proc/Makefile.am
index b19b2e6..3893d7b 100644
--- a/plugins/i2c-proc/Makefile.am
+++ b/plugins/i2c-proc/Makefile.am
@@ -1,5 +1,5 @@
 # I2C-PROC plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libi2c_proc_la_SOURCES = \
 i2c-proc-plugin.c
 
 libi2c_proc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi2c_proc_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi2c_proc_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/i2c-sys/Makefile.am b/plugins/i2c-sys/Makefile.am
index 3901644..c95a06c 100644
--- a/plugins/i2c-sys/Makefile.am
+++ b/plugins/i2c-sys/Makefile.am
@@ -1,5 +1,5 @@
 # I2C-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libi2c_sys_la_SOURCES = \
 i2c-sys-plugin.c
 
 libi2c_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi2c_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi2c_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/i8k/Makefile.am b/plugins/i8k/Makefile.am
index 3bf5beb..1e0d1b9 100644
--- a/plugins/i8k/Makefile.am
+++ b/plugins/i8k/Makefile.am
@@ -1,5 +1,5 @@
 # I8K plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libi8k_la_SOURCES = \
 i8k-plugin.c
 
 libi8k_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libi8k_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libi8k_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/ibm-acpi/Makefile.am b/plugins/ibm-acpi/Makefile.am
index 49e9c73..1d45a90 100644
--- a/plugins/ibm-acpi/Makefile.am
+++ b/plugins/ibm-acpi/Makefile.am
@@ -1,5 +1,5 @@
 # IBM-ACPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libibm_acpi_la_SOURCES = \
 ibm-acpi-plugin.c
 
 libibm_acpi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libibm_acpi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libibm_acpi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/libsensors/Makefile.am b/plugins/libsensors/Makefile.am
index 138872e..d8ac419 100644
--- a/plugins/libsensors/Makefile.am
+++ b/plugins/libsensors/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 # libsensors plugin
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
@@ -18,4 +18,4 @@ liblibsensors_la_SOURCES = \
 libsensors-plugin.c
 
 liblibsensors_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) $(LIBSENSORS_LIBS)
-liblibsensors_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+liblibsensors_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/nvidia/Makefile.am b/plugins/nvidia/Makefile.am
index 72ced99..9deabce 100644
--- a/plugins/nvidia/Makefile.am
+++ b/plugins/nvidia/Makefile.am
@@ -1,5 +1,5 @@
 # NVIDIA plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libnvidia_la_SOURCES = \
 nvidia-plugin.c
 
 libnvidia_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) $(NVIDIA_LIBS)
-libnvidia_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libnvidia_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/omnibook/Makefile.am b/plugins/omnibook/Makefile.am
index 2cb3c06..4880a55 100644
--- a/plugins/omnibook/Makefile.am
+++ b/plugins/omnibook/Makefile.am
@@ -1,5 +1,5 @@
 # OMNIBOOK plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libomnibook_la_SOURCES = \
 omnibook-plugin.c
 
 libomnibook_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libomnibook_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libomnibook_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/pmu-sys/Makefile.am b/plugins/pmu-sys/Makefile.am
index d8442fc..849028e 100644
--- a/plugins/pmu-sys/Makefile.am
+++ b/plugins/pmu-sys/Makefile.am
@@ -1,5 +1,5 @@
 # PMU-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libpmu_sys_la_SOURCES = \
 pmu-sys-plugin.c
 
 libpmu_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libpmu_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libpmu_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/smu-sys/Makefile.am b/plugins/smu-sys/Makefile.am
index fb03275..999e7fc 100644
--- a/plugins/smu-sys/Makefile.am
+++ b/plugins/smu-sys/Makefile.am
@@ -1,5 +1,5 @@
 # SMU-SYS plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libsmu_sys_la_SOURCES = \
 smu-sys-plugin.c
 
 libsmu_sys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libsmu_sys_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libsmu_sys_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/sonypi/Makefile.am b/plugins/sonypi/Makefile.am
index b206cf7..045bd34 100644
--- a/plugins/sonypi/Makefile.am
+++ b/plugins/sonypi/Makefile.am
@@ -1,5 +1,5 @@
 # SONYPI plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -18,4 +18,4 @@ libsonypi_la_SOURCES = \
 sonypi-plugin.c
 
 libsonypi_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS)
-libsonypi_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libsonypi_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/plugins/udisks/Makefile.am b/plugins/udisks/Makefile.am
index d092fe4..b2aa06e 100644
--- a/plugins/udisks/Makefile.am
+++ b/plugins/udisks/Makefile.am
@@ -1,5 +1,5 @@
 # UDisks plugin
-plugindir = $(libdir)/sensors-applet/plugins
+plugindir = $(libdir)/mate-sensors-applet/plugins
 
 INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 -DG_LOG_DOMAIN=\""Sensors Applet"\" \
@@ -22,4 +22,4 @@ libudisks_la_SOURCES = \
 
 libudisks_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(DBUSGLIB_LIBS) $(LIBATASMART_LIBS)
 
-libudisks_la_LIBADD = $(top_builddir)/lib/libsensors-applet-plugin.la
+libudisks_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la
diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am
index bce8d57..eae9e71 100644
--- a/sensors-applet/Makefile.am
+++ b/sensors-applet/Makefile.am
@@ -42,9 +42,9 @@ sensors_applet_SOURCES = main.c \
 # install headers for plugins to use
 INST_H_FILES = sensors-applet-plugin.h sensors-applet-sensor.h
 
-headerdir = $(prefix)/include/sensors-applet
+headerdir = $(prefix)/include/mate-sensors-applet
 
 header_DATA = $(INST_H_FILES)
 
 # since it is separate
-EXTRA_DIST = sensors-applet-plugin.h
-\ No newline at end of file
+EXTRA_DIST = sensors-applet-plugin.h
diff --git a/sensors-applet/about-dialog.c b/sensors-applet/about-dialog.c
index 0a538d2..21bd21d 100644
--- a/sensors-applet/about-dialog.c
+++ b/sensors-applet/about-dialog.c
@@ -27,6 +27,7 @@ void about_dialog_open(SensorsApplet *sensors_applet) {
 gchar *translator;
 const gchar *authors[] = {
 "Alex Murray <[email protected]>",
+ "Stefano Karapetsas <[email protected]>",
 NULL
 };
 
@@ -40,12 +41,12 @@ void about_dialog_open(SensorsApplet *sensors_applet) {
 gtk_show_about_dialog(NULL,
 "program-name", PACKAGE_NAME, 
 "version", PACKAGE_VERSION,
- "copyright", "(C) 2005-2009, Alex Murray <[email protected]>",
+ "copyright", "(C) 2005-2009, Alex Murray <[email protected]>\n(C) 2011, Stefano Karapetsas <[email protected]>",
 "authors", authors,
 "documenters", authors,
 "translator-credits", translator,
 "logo-icon-name", SENSORS_APPLET_ICON,
- "website", "http://sensors-applet.sourceforge.net/",
+ "website", "https://github.com/stefano-k/mate-sensors-applet",
 NULL);
 
 
diff --git a/sensors-applet/sensors-applet.h b/sensors-applet/sensors-applet.h
index 3aecb18..5ddd9dc 100644
--- a/sensors-applet/sensors-applet.h
+++ b/sensors-applet/sensors-applet.h
@@ -36,17 +36,17 @@ typedef struct _ActiveSensor ActiveSensor;
 #include "prefs-dialog.h"
 
 #define GRAPH_FRAME_EXTRA_WIDTH 6
-#define SENSORS_APPLET_ICON "sensors-applet"
+#define SENSORS_APPLET_ICON "mate-sensors-applet"
 
 static const gchar * const stock_icons[NUM_ICONS] = {
- "sensors-applet-cpu",
- "sensors-applet-drive-harddisk",
- "sensors-applet-battery",
- "sensors-applet-memory",
- "sensors-applet-gpu",
- "sensors-applet-chip",
- "sensors-applet-fan",
- "sensors-applet-case"
+ "mate-sensors-applet-cpu",
+ "mate-sensors-applet-drive-harddisk",
+ "mate-sensors-applet-battery",
+ "mate-sensors-applet-memory",
+ "mate-sensors-applet-gpu",
+ "mate-sensors-applet-chip",
+ "mate-sensors-applet-fan",
+ "mate-sensors-applet-case"
 }; 
 
 #define DEFAULT_ICON_SIZE 22