diff options
| author | info-cppsp <[email protected]> | 2018-01-18 20:58:52 +0100 | 
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-25 16:23:14 +0100 | 
| commit | 9a5fc1a315cd093563b493c35f521e0ec2621f4a (patch) | |
| tree | b8d59ea2b93a787822cafb55d5e723b654a95b42 | |
| parent | aaddbc0387c7e4089fe1d828ae422f2c88885d9f (diff) | |
| download | mate-sensors-applet-9a5fc1a315cd093563b493c35f521e0ec2621f4a.tar.bz2 mate-sensors-applet-9a5fc1a315cd093563b493c35f521e0ec2621f4a.tar.xz | |
Remove deprecated eee plugin
According to https://github.com/mate-desktop/mate-sensors-applet/pull/64#issuecomment-358425379 the eee plugin is obsolete, the same functionality is available through lm-sensors.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/eee/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/eee/eee-plugin.c | 116 | ||||
| -rw-r--r-- | plugins/eee/eee-plugin.h | 24 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | 
6 files changed, 0 insertions, 165 deletions
| diff --git a/configure.ac b/configure.ac index 2081793..9261f77 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,6 @@ AC_CONFIG_FILES([  	plugins/acpi/Makefile  	plugins/udisks/Makefile  	plugins/udisks2/Makefile -	plugins/eee/Makefile  	plugins/hddtemp/Makefile  	plugins/i2c-proc/Makefile  	plugins/i2c-sys/Makefile diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d787000..f0e46a1 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -2,7 +2,6 @@ DIST_SUBDIRS = \  	acpi \  	udisks \  	udisks2 \ -	eee \  	hddtemp \          i2c-proc \          i2c-sys \ @@ -19,7 +18,6 @@ DIST_SUBDIRS = \  SUBDIRS = \  	acpi \ -	eee \  	hddtemp \  	i8k \  	ibm-acpi \ diff --git a/plugins/eee/Makefile.am b/plugins/eee/Makefile.am deleted file mode 100644 index 99c5785..0000000 --- a/plugins/eee/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# ACPI plugin -plugindir = $(libdir)/mate-sensors-applet/plugins - -AM_CPPFLAGS = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \ -	-DG_LOG_DOMAIN=\""Sensors Applet"\" \ -	-DPIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)/"\" \ -	-DDATADIR=\""$(datadir)"\" \ -	-DLIBDIR=\""$(libdir)"\" \ -        -DSYSCONFDIR=\""$(sysconfdir)"\" \ -        -DPREFIX=\""$(prefix)"\" \ -	-I$(top_srcdir) \ -	$(GLIB_CFLAGS) - -plugin_LTLIBRARIES = libeee.la - -libeee_la_SOURCES = \ -	eee-plugin.h	\ -	eee-plugin.c - -libeee_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) $(GLIB_LIBS) -libeee_la_LIBADD = $(top_builddir)/lib/libmate-sensors-applet-plugin.la diff --git a/plugins/eee/eee-plugin.c b/plugins/eee/eee-plugin.c deleted file mode 100644 index eadd63a..0000000 --- a/plugins/eee/eee-plugin.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2005-2006 Nickolay Surin <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif /* HAVE_CONFIG_H */ - -#ifdef HAVE_STDIO_H -#include <stdio.h> -#endif /* HAVE_STDIO_H */ - -#include <glib.h> -#include <glib/gi18n.h> -#include "eee-plugin.h" - -const gchar *plugin_name = "eee"; - -#define EEE_FAN_FILE "/proc/eee/fan_rpm" - -enum { -    EEE_DEVICE_FILE_OPEN_ERROR, -    EEE_DEVICE_FILE_READ_ERROR -}; - -static void eee_plugin_add_sensor(GList **sensors, const gchar *path) { -    gchar *dirname; -    gchar *id; -    gchar *label; - -    dirname = g_path_get_dirname(path); -    id = g_path_get_basename(dirname); -    g_free(dirname); - -    sensors_applet_plugin_add_sensor(sensors, -                                     path, -                                     id, -                                     _("FAN"), -                                     FAN_SENSOR, -                                     TRUE, -                                     FAN_ICON, -                                     DEFAULT_GRAPH_COLOR); -    g_free(id); -} - -static void eee_plugin_test_sensor(GList **sensors, -                   const gchar *path) { -    gchar *filename; -    filename = g_path_get_basename(path); -    eee_plugin_add_sensor(sensors, path); -    g_free(filename); - -} - - -static GList *eee_plugin_init(void) { -    GList *sensors = NULL; - -    sensors_applet_plugin_find_sensors(&sensors, EEE_FAN_FILE, -                       eee_plugin_test_sensor); -    return sensors; -} - -static gdouble eee_plugin_get_sensor_value(const gchar *path, -                                           const gchar *id, -                                           SensorType type, -                                           GError **error) { - -    FILE *fp; -    gfloat sensor_value = 0; - -    if (NULL == (fp = fopen(path, "r"))) { -        g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, EEE_DEVICE_FILE_OPEN_ERROR, "Error opening sensor device file %s", path); -        return sensor_value; -    } - -    if (fscanf(fp, "%f", &sensor_value) < 1) { -        g_set_error(error, SENSORS_APPLET_PLUGIN_ERROR, EEE_DEVICE_FILE_READ_ERROR, "Error reading from sensor device file %s", path); -        fclose(fp); -        return sensor_value; -    } -    fclose(fp); - -    return (gdouble)sensor_value; -} - -const gchar *sensors_applet_plugin_name(void) -{ -    return plugin_name; -} - -GList *sensors_applet_plugin_init(void) -{ -    return eee_plugin_init(); -} - -gdouble sensors_applet_plugin_get_sensor_value(const gchar *path, -                           const gchar *id, -                           SensorType type, -                           GError **error) { -    return eee_plugin_get_sensor_value(path, id, type, error); -} diff --git a/plugins/eee/eee-plugin.h b/plugins/eee/eee-plugin.h deleted file mode 100644 index 8e6ad64..0000000 --- a/plugins/eee/eee-plugin.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2005-2006 Nickolay Surin <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA - */ - -#ifndef EEE_PLUGIN_H -#define EEE_PLUGIN_H - -#include <sensors-applet/sensors-applet-plugin.h> - -#endif /* EEE_PLUGIN_H*/ diff --git a/po/POTFILES.in b/po/POTFILES.in index ea17e60..53f60d3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,7 +11,6 @@ plugins/nvidia/nvidia-plugin.c  plugins/i2c-proc/i2c-proc-plugin.c  plugins/acpi/acpi-plugin.c  plugins/smu-sys/smu-sys-plugin.c -plugins/eee/eee-plugin.c  plugins/aticonfig/aticonfig-plugin.c  sensors-applet/prefs-dialog.c  sensors-applet/sensors-applet.h | 
