[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 15/96: Fix settings definitions and TextView::do_update font_name -> font

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nick pushed a commit to branch master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 3bf82277961cf976670c0c0bdf7f46f0fc6220f9
Author: Omega Weapon <OmegaPhil at gmail.com>
Date:   Sun Oct 27 13:55:41 2013 +0000

    Fix settings definitions and TextView::do_update font_name -> font
---
 src/bar-view.cpp    |    2 +-
 src/canvas-view.cpp |    2 +-
 src/column-view.cpp |    2 +-
 src/curve-view.cpp  |    2 +-
 src/flame-view.cpp  |    2 +-
 src/text-view.cpp   |   16 ++++++++--------
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 51e1ecc..6e324d7 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -141,7 +141,7 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving color
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index 7f4dee3..62fe298 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -90,7 +90,7 @@ void CanvasView::do_update()
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving viewer size
diff --git a/src/column-view.cpp b/src/column-view.cpp
index 5ffa0ea..bb8f9d5 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -122,7 +122,7 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving color
diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index b864877..6ba2ed9 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -129,7 +129,7 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas,
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving color
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index 05bbf43..5d41173 100644
--- a/src/flame-view.cpp
+++ b/src/flame-view.cpp
@@ -105,7 +105,7 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving color
diff --git a/src/text-view.cpp b/src/text-view.cpp
index b5bea33..6be377f 100644
--- a/src/text-view.cpp
+++ b/src/text-view.cpp
@@ -99,7 +99,7 @@ void TextView::do_display()
 
 void TextView::do_update()
 {
-  bool font_name_missing = true;
+  bool font_missing = true;
 
   /* First update viewer font
    * Keeping with the default settings group for viewer settings
@@ -115,17 +115,17 @@ void TextView::do_update()
     // Loading font_name
     if (xfce_rc_has_entry(settings, "viewer_font"))
     {
-      font_name = xfce_rc_read_entry(settings, "viewer_font", "");
-      font_name_missing = false;
+      font = xfce_rc_read_entry(settings, "viewer_font", "");
+      font_missing = false;
     }
 
     // Close settings file
     xfce_rc_close(settings);
   }
 
-  /* Saving if font name was not recorded. XFCE4 configuration is done in
+  /* Saving if font was not recorded. XFCE4 configuration is done in
    * read and write stages, so this needs to be separated */
-  if (font_name_missing)
+  if (font_missing)
   {
     // Search for a writeable settings file, create one if it doesnt exist
     file = xfce_panel_plugin_save_location(applet->panel_applet, true);
@@ -133,11 +133,11 @@ void TextView::do_update()
     if (file)
     {
       // Opening setting file
-      settings = xfce_rc_simple_open(file, false);
+      XfceRc* settings = xfce_rc_simple_open(file, false);
       g_free(file);
 
       // Saving viewer size
-      xfce_rc_write_entry(settings, "viewer_font", font_name.c_str());
+      xfce_rc_write_entry(settings, "viewer_font", font.c_str());
 
       // Close settings file
       xfce_rc_close(settings);
@@ -146,7 +146,7 @@ void TextView::do_update()
     {
       // Unable to obtain writeable config file - informing user
       std::cerr << _("Unable to obtain writeable config file path in "
-        "order to update font name in TextView::do_update call!\n");
+        "order to update font in TextView::do_update call!\n");
     }
   }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.