[Xfce4-commits] [panel-plugins/xfce4-sensors-plugin] 01/02: Renamed method in middlelayer

[noreply at xfce.org]

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

timystery pushed a commit to branch master
in repository panel-plugins/xfce4-sensors-plugin.

commit 68a03100d1c55234a629133c5e20d7d5d709a06b
Author: Fabian <timystery at arcor.de>
Date:   Mon Apr 3 21:47:10 2017 +0200

    Renamed method in middlelayer
---
 include/middlelayer.h         | 2 +-
 lib/middlelayer.c             | 2 +-
 lib/sensors-interface.c       | 2 +-
 panel-plugin/sensors-plugin.c | 2 +-
 src/main.c                    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/middlelayer.h b/include/middlelayer.h
index 6d1f25c..7dab59b 100644
--- a/include/middlelayer.h
+++ b/include/middlelayer.h
@@ -85,7 +85,7 @@ void free_chip (gpointer chip, gpointer data);
 /**
  * Clean up structures and call library routines for ending "session".
  */
-void sensor_interface_cleanup ();
+void cleanup_interfaces ();
 
 
 /**
diff --git a/lib/middlelayer.c b/lib/middlelayer.c
index f4f012d..cde5c0e 100644
--- a/lib/middlelayer.c
+++ b/lib/middlelayer.c
@@ -313,7 +313,7 @@ free_chip (gpointer chip, gpointer data)
 
 /* -------------------------------------------------------------------------- */
 void
-sensor_interface_cleanup (void)
+cleanup_interfaces (void)
 {
 #ifdef HAVE_LIBSENSORS
     sensors_cleanup();
diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c
index 7233344..8ee559f 100644
--- a/lib/sensors-interface.c
+++ b/lib/sensors-interface.c
@@ -477,7 +477,7 @@ free_widgets (t_sensors_dialog *ptr_sensors_dialog)
     g_ptr_array_foreach (ptr_sensors_dialog->sensors->chips, free_chip, NULL);
 
     /* stop association to libsensors and others*/
-    sensor_interface_cleanup();
+    cleanup_interfaces();
 
     g_ptr_array_free (ptr_sensors_dialog->sensors->chips, TRUE);
 
diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c
index 9b09ceb..247ff65 100644
--- a/panel-plugin/sensors-plugin.c
+++ b/panel-plugin/sensors-plugin.c
@@ -1203,7 +1203,7 @@ sensors_free (XfcePanelPlugin *plugin, t_sensors *sensors)
     g_return_if_fail (sensors != NULL);
 
     /* stop association to libsensors and others*/
-    sensor_interface_cleanup();
+    cleanup_interfaces();
 
     /* remove timeout functions */
     remove_gsource (sensors->timeout_id);
diff --git a/src/main.c b/src/main.c
index 4cc3a14..8d44dcd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -194,10 +194,10 @@ main (int argc, char **argv)
 
     gtk_main();
 
-    gtk_widget_destroy(window);
-
     /* do the cleaning? */
     free_widgets(ptr_sensors_dialog); /* counterpart to init_widgets() inside create_main_window() */
+    gtk_widget_destroy(window);
+
     g_free (ptr_sensors_dialog->sensors);
     g_free (ptr_sensors_dialog);
 

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