[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 04/04: Try fixing bug 14398 by no longer using redundant information for accessing sensor features

[noreply at xfce.org]

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

t   i   m   y   s   t   e   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-sensors-plugin.

commit 93347d57dee7a679f349327a30436dd920ce2d58
Author: Fabian <timystery at arcor.de>
Date:   Wed Oct 10 22:05:27 2018 +0200

    Try fixing bug 14398 by no longer using redundant information for accessing sensor features
---
 lib/configuration.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/configuration.c b/lib/configuration.c
index 0dfddb3..b5e9658 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -167,8 +167,6 @@ sensors_write_config (XfcePanelPlugin *plugin,t_sensors *ptr_sensors)
 
                        xfce_rc_set_group (ptr_xfcerc, str_feature);
 
-                       xfce_rc_write_int_entry (ptr_xfcerc, "Id", get_Id_from_address(idx_chips, idx_features, ptr_sensors));
-
                        /* only use this if no hddtemp sensor */
                        /* or do only use this , if it is an lmsensors device. whatever. */
                        if ( strcmp(ptr_chip->sensorId, _("Hard disks")) != 0 ) /* chip->name? */
@@ -384,19 +382,7 @@ sensors_read_config (XfcePanelPlugin *ptr_panelplugin, t_sensors *ptr_sensors)
 
                         address=0;
 
-                        id = (gint) xfce_rc_read_int_entry (ptr_xfceresource, "Id", 0);
-
-                        /* FIXME: compare strings, or also have hddtemp and acpi store numeric str_values */
-
-                        /* assert correctly saved str_file */
-                        if (id >= 0 && strcmp(ptr_chip->sensorId, _("Hard disks")) != 0) { /* chip->name? */
-                            ptr_chipfeature = g_ptr_array_index(ptr_chip->chip_features, id);
-                            address = (gint) xfce_rc_read_int_entry (ptr_xfceresource, "Address", 0);
-                            /* FIXME: it might be necessary to use sensors->addresses here */
-                            if (!ptr_chipfeature || ptr_chipfeature->address != address)
-                                continue;
-                        }
-                        else if ((str_value = xfce_rc_read_entry (ptr_xfceresource, "DeviceName", NULL))
+                        if ((str_value = xfce_rc_read_entry (ptr_xfceresource, "DeviceName", NULL))
                             && *str_value) {
                             if (ptr_chipfeature->devicename)
                                 g_free (ptr_chipfeature->devicename);

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