diff options
| author | info-cppsp <[email protected]> | 2018-02-13 23:20:57 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-02-27 11:03:02 +0100 |
| commit | 4ebb00de19fa04ea7d105e0f7456fa1f8e009776 (patch) | |
| tree | ae3d06b50be2cc81313f843d58bbde0a190527be /sensors-applet/sensors-applet.c | |
| parent | cba90be59d939b2ddcf450fb9da4159fb9dfa47d (diff) | |
| download | mate-sensors-applet-4ebb00de19fa04ea7d105e0f7456fa1f8e009776.tar.bz2 mate-sensors-applet-4ebb00de19fa04ea7d105e0f7456fa1f8e009776.tar.xz | |
fix save order of sensors v2
Diffstat (limited to 'sensors-applet/sensors-applet.c')
| -rw-r--r-- | sensors-applet/sensors-applet.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c index 583c42c..fd7bc6b 100644 --- a/sensors-applet/sensors-applet.c +++ b/sensors-applet/sensors-applet.c @@ -51,6 +51,10 @@ #define ROW_SPACING 1 +/* builder for sensor sorting verification */ +static GVariantBuilder gvb_sensors_hash_list; + + /* callbacks for panel menu */ static void prefs_cb(GtkAction *action, gpointer *data) { @@ -962,6 +966,10 @@ gboolean sensors_applet_add_sensor(SensorsApplet *sensors_applet, gchar *gsuid = sensors_applet_settings_get_unique_id (interface, id, path); gchar *settings_path = g_strdup_printf ("%s%s/", applet_path, gsuid); GSettings *settings = g_settings_new_with_path ("org.mate.sensors-applet.sensor", settings_path); + + /* add hash to temp sorting list */ + g_variant_builder_add (&gvb_sensors_hash_list, "s", gsuid); + g_free (applet_path); g_free (gsuid); g_free (settings_path); @@ -1255,12 +1263,25 @@ void sensors_applet_init(SensorsApplet *sensors_applet) { /* init gsettings */ sensors_applet->settings = mate_panel_applet_settings_new (sensors_applet->applet, "org.mate.sensors-applet"); - // load sensors from array saved in gsettings - sensors_applet_conf_setup_sensors(sensors_applet); - /* now do any setup needed manually */ + /* set up builder for sorting verification */ + g_variant_builder_init (&gvb_sensors_hash_list, G_VARIANT_TYPE ("as")); + + /* set up / load sensors from the plugins */ sensors_applet_plugins_load_all(sensors_applet); + /* set sorting hash array */ + GVariant *gv_temp = g_variant_builder_end (&gvb_sensors_hash_list); + sensors_applet->sensors_hash_array = g_variant_dup_strv (gv_temp, NULL); + g_variant_unref (gv_temp); + + /* sort sensors based on saved sorting */ + sensors_applet_settings_sort_sensors(sensors_applet); + + /* free hash array */ + g_strfreev (sensors_applet->sensors_hash_array); + + /* should have created sensors tree above, but if have not was because we couldn't find any sensors */ if (NULL == sensors_applet->sensors) { GtkWidget *label; |