[Xfce4-commits] [panel-plugins/xfce4-systemload-plugin] 04/04: Stop reading deprecated Use_Timeout_Seconds and Use_Click_Command settings.

[noreply at xfce.org]

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

l   a   n   d   r   y       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-systemload-plugin.

commit a4175ed9d85908731c9171c8452b10bf21019456
Author: Landry Breuil <landry at xfce.org>
Date:   Sat Dec 23 22:12:35 2017 +0100

    Stop reading deprecated Use_Timeout_Seconds and Use_Click_Command settings.
    
    Instead use the value or the length of the corresponding string.
---
 panel-plugin/systemload.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
index 886e85a..6376250 100644
--- a/panel-plugin/systemload.c
+++ b/panel-plugin/systemload.c
@@ -519,10 +519,8 @@ monitor_read_config(XfcePanelPlugin *plugin, t_global_monitor *global)
             global->timeout = 500;
         global->timeout_seconds = xfce_rc_read_int_entry (
                 rc, "Timeout_Seconds", global->timeout_seconds);
-        global->use_timeout_seconds = xfce_rc_read_bool_entry (
-                rc, "Use_Timeout_Seconds", global->use_timeout_seconds);
-        global->command.enabled = xfce_rc_read_bool_entry (
-                rc, "Use_Click_Command", global->command.enabled);
+        if (global->timeout_seconds > 0)
+            global->use_timeout_seconds = TRUE;
         value = xfce_rc_read_entry (
                 rc, "Click_Command", NULL);
         if (value && *value)
@@ -530,6 +528,8 @@ monitor_read_config(XfcePanelPlugin *plugin, t_global_monitor *global)
             if (global->command.command_text)
                 g_free(global->command.command_text);
             global->command.command_text = g_strdup(value);
+            if (strlen(value) > 0)
+                global->command.enabled = TRUE;
         }
     }
 

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