solved some conflicts with sensors-applet

15 files changed, 30 insertions, 30 deletions

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