[Xfce4-commits] <xfce4-sensors-plugin:master> ignore ordering when reading different inputs

[Fabian]

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

commit 66ee3dcdda2cda6c17de10c69445e84b41841ea3
Author: Fabian <timystery at arcor.de>
Date:   Sat May 7 10:46:06 2011 +0200

    ignore ordering when reading different inputs

 lib/configuration.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/configuration.c b/lib/configuration.c
index 1dcc1b2..149f763 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -276,13 +276,16 @@ sensors_read_preliminary_config (XfcePanelPlugin *plugin, t_sensors *sensors)
 }
 
 /* Read the configuration file at init */
+// TODO: modify to store chipname as indicator and access features by acpitz-1_Feature0 etc.
+// this will require differently storing the stuff as well. 
+// targeted for 1.1 or 1.2 release
 void
 sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
 {
     const char *value;
     char *file;
     XfceRc *rc;
-    int i, j;
+    int i, j, k;
     char rc_chip[8], feature[20];
     gchar* sensorName=NULL;
     gint num_sensorchip, id, address;
@@ -303,9 +306,6 @@ sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
     sensors_read_general_config (rc, sensors);
 
     for (i = 0; i<sensors->num_sensorchips; i++) {
-        chip = (t_chip *) g_ptr_array_index (sensors->chips, i);
-        if (chip==NULL)
-            break;
 
         g_snprintf (rc_chip, 8, "Chip%d", i);
 
@@ -327,8 +327,15 @@ sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
             g_return_if_fail (num_sensorchip < sensors->num_sensorchips);
 
             /* now featuring enhanced string comparison */
-            g_assert (chip!=NULL);
-            if ( strcmp(chip->sensorId, sensorName)==0 ) {
+            //g_assert (chip!=NULL);
+            k = 0;
+            do {
+              chip = (t_chip *) g_ptr_array_index (sensors->chips, k++);
+              if (chip==NULL)
+                  break;
+              }
+            while ( strcmp(chip->sensorId, sensorName) != 0 );
+            if ( chip!=NULL && strcmp(chip->sensorId, sensorName)==0 ) {
 
                 for (j=0; j<chip->num_features; j++) {
                     chipfeature = (t_chipfeature *) g_ptr_array_index (
@@ -396,9 +403,9 @@ sensors_read_config (XfcePanelPlugin *plugin, t_sensors *sensors)
                             chipfeature->max_value = atof (value);
 
 
-                    } /* end if */
+                    } /* end if rc_grup has feature*/
 
-                } /* end for */
+                } /* end for features */
 
             } /* end if */