[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 01/02: Rename incorrectly named cpu to tacho and increase version
noreply at xfce.org
noreply at xfce.org
Sat Feb 4 11:57:40 CET 2017
This is an automated email from the git hooks/post-receive script.
timystery pushed a commit to branch master
in repository panel-plugins/xfce4-sensors-plugin.
commit f0d1f938c1abfd3c87821c8ce444626e4c6acdaa
Author: Fabian <timystery at arcor.de>
Date: Sat Feb 4 11:46:12 2017 +0100
Rename incorrectly named cpu to tacho and increase version
---
configure.ac.in | 2 +-
include/Makefile.am | 2 +-
include/{cpu.h => tacho.h} | 2 +-
lib/configuration.c | 6 +++---
lib/sensors-interface-common.c | 2 +-
lib/{cpu.c => tacho.c} | 4 ++--
panel-plugin/sensors-plugin.c | 2 +-
src/actions.h | 2 +-
src/callbacks.c | 2 +-
src/interface.c | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 32947ee..f49e8ad 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([libxfce4sensors_verinfo], [3:4:2])
m4_define([xfce4_sensors_version_major], [1])
m4_define([xfce4_sensors_version_minor], [2])
-m4_define([xfce4_sensors_version_micro], [95])
+m4_define([xfce4_sensors_version_micro], [96])
m4_define([xfce4_sensors_version_nano], [])
m4_define([xfce4_sensors_version_build], [@REVISION@])
m4_define([xfce4_sensors_version_tag], []) dnl may be set to 'git'
diff --git a/include/Makefile.am b/include/Makefile.am
index 9995cb1..07b55fe 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,7 +3,7 @@
EXTRA_DIST = \
acpi.h \
hddtemp.h \
- cpu.h \
+ tacho.h \
Makefile.am \
sensors-interface-common.h \
sensors-interface-plugin.h \
diff --git a/include/cpu.h b/include/tacho.h
similarity index 99%
rename from include/cpu.h
rename to include/tacho.h
index 43dcd55..c515ea8 100644
--- a/include/cpu.h
+++ b/include/tacho.h
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/* cpu.h */
+/* tacho.h */
#ifndef __CPU_H
#define __CPU_H
diff --git a/lib/configuration.c b/lib/configuration.c
index 32397c9..e5e76d2 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -34,7 +34,7 @@
/* Package includes */
#include <configuration.h>
-#include <cpu.h>
+#include <tacho.h>
#include <sensors-interface.h>
#include <types.h>
@@ -108,7 +108,7 @@ sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors)
sensors->val_fontsize);
if (font!=NULL)
- xfce_rc_write_entry (rc, "Font", font); // the font for the tachometers exported from cpu.h
+ xfce_rc_write_entry (rc, "Font", font); // the font for the tachometers exported from tacho.h
xfce_rc_write_int_entry (rc, "Lines_Size", sensors->lines_size);
@@ -217,7 +217,7 @@ sensors_read_general_config (XfceRc *rc, t_sensors *sensors)
if ((value = xfce_rc_read_entry (rc, "Font", NULL)) && *value) {
//g_free(sensors->font); // font is initialized to NULL
- font = g_strdup(value); // in cpu.h for the tachometers
+ font = g_strdup(value); // in tacho.h for the tachometers
}
sensors->val_fontsize = xfce_rc_read_int_entry (rc,
diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
index b625454..3dd62bf 100644
--- a/lib/sensors-interface-common.c
+++ b/lib/sensors-interface-common.c
@@ -31,7 +31,7 @@
#include <configuration.h>
#include <sensors-interface-common.h>
#include <middlelayer.h>
-#include <cpu.h>
+#include <tacho.h>
t_sensors *
sensors_new (XfcePanelPlugin *plugin, gchar *plugin_config_file)
diff --git a/lib/cpu.c b/lib/tacho.c
similarity index 99%
rename from lib/cpu.c
rename to lib/tacho.c
index 641d1d3..6c357b0 100644
--- a/lib/cpu.c
+++ b/lib/tacho.c
@@ -23,7 +23,7 @@
#include <glib/gprintf.h>
/* Package includes */
-#include <cpu.h>
+#include <tacho.h>
#include <types.h>
#define DEFAULT_HEIGHT 64
@@ -70,7 +70,7 @@ static GtkSizeRequestMode gtk_sensorstacho_get_request_mode(GtkWidget *widget);
//GdkEventButton *event);
-gchar *font = NULL; // declared as extern in cpu.h
+gchar *font = NULL; // declared as extern in tacho.h
G_DEFINE_TYPE( GtkSensorsTacho, gtk_sensorstacho, GTK_TYPE_DRAWING_AREA )
diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c
index e34b903..c6e43c3 100644
--- a/panel-plugin/sensors-plugin.c
+++ b/panel-plugin/sensors-plugin.c
@@ -50,7 +50,7 @@
#include <sensors-interface.h>
#include <sensors-interface-plugin.h> // includes sensors-interface-common.h
#include <middlelayer.h>
-#include <cpu.h>
+#include <tacho.h>
/* Local includes */
#include "sensors-plugin.h"
diff --git a/src/actions.h b/src/actions.h
index 7738e12..e1f8991 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -27,7 +27,7 @@
/* Package includes */
#include <sensors-interface-common.h>
-#include <cpu.h>
+#include <tacho.h>
gboolean refresh_view (gpointer data);
void refresh_tacho_view (t_sensors_dialog *ptr_sensors_dialog_structure);
diff --git a/src/callbacks.c b/src/callbacks.c
index e74e213..7b49c25 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -31,7 +31,7 @@
/* Package includes */
#include <sensors-interface.h>
-#include <cpu.h> /* contains "extern gchar * font" */
+#include <tacho.h> /* contains "extern gchar * font" */
/* Local includes */
#include "callbacks.h"
diff --git a/src/interface.c b/src/interface.c
index b389dc6..2ac39b3 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -27,7 +27,7 @@
#include <libxfce4ui/libxfce4ui.h>
/* Package includes */
-#include <cpu.h>
+#include <tacho.h>
#include <sensors-interface.h>
#include <sensors-interface-common.h>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list