[Xfce4-commits] <xfce4-sensors-plugin:master> explain use of font so that the invalid patches will no longer be applied

[Fabian]

Updating branch refs/heads/master
         to 537c3753541d2e3bc54fdbc4b4b55f72a06adb71 (commit)
       from 66ee3dcdda2cda6c17de10c69445e84b41841ea3 (commit)

commit 537c3753541d2e3bc54fdbc4b4b55f72a06adb71
Author: Fabian <timystery at arcor.de>
Date:   Mon May 9 12:27:09 2011 +0200

    explain use of font so that the invalid patches will no longer be applied

 include/cpu.h                      |    2 +-
 include/sensors-interface-plugin.h |    3 ---
 lib/configuration.c                |    3 ++-
 lib/cpu.c                          |    4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/cpu.h b/include/cpu.h
index dbc83dc..d7fa94e 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -69,7 +69,7 @@ void gtk_cpu_unset_color (GtkCpu *cpu);
 
 void gtk_cpu_paint (GtkWidget *widget);
 
-extern gchar *font; // = NULL;
+extern gchar *font;
 
 G_END_DECLS
 
diff --git a/include/sensors-interface-plugin.h b/include/sensors-interface-plugin.h
index 09f4f88..d23caac 100644
--- a/include/sensors-interface-plugin.h
+++ b/include/sensors-interface-plugin.h
@@ -62,9 +62,6 @@ typedef struct {
     /* font size for display in panel */
     gchar *font_size;
     gint font_size_numerical;
-/*
-    gchar *font;
-*/
 
     /* temperature scale for display in panel */
     t_tempscale scale;
diff --git a/lib/configuration.c b/lib/configuration.c
index 149f763..aa24581 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -107,7 +107,8 @@ sensors_write_config (XfcePanelPlugin *plugin, t_sensors *sensors)
     xfce_rc_write_int_entry (rc, "Font_Size_Numerical",
                                 sensors->font_size_numerical);
 
-    xfce_rc_write_entry (rc, "Font", font);
+    if (font!=NULL)
+      xfce_rc_write_entry (rc, "Font", font); // the font for the tachometers exported from cpu.h
 
     xfce_rc_write_int_entry (rc, "Lines_Size", sensors->lines_size);
 
diff --git a/lib/cpu.c b/lib/cpu.c
index 26f7f84..34b7fed 100644
--- a/lib/cpu.c
+++ b/lib/cpu.c
@@ -42,12 +42,10 @@ static void gtk_cpu_size_allocate(GtkWidget *widget,
 static void gtk_cpu_realize(GtkWidget *widget);
 static gboolean gtk_cpu_expose(GtkWidget *widget,
     GdkEventExpose *event);
-//static void gtk_cpu_paint(GtkWidget *widget);
 static void gtk_cpu_destroy(GtkObject *object);
 
 
-//extern gchar *font;
-gchar *font = NULL;
+gchar *font = NULL; // declared as extern in cpu.h
 
 
 GtkType