X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Flogind%2Flogind.c;h=a0b0343f27708c80c113ddc6d64e709d2284b856;hp=b08db9f17f3de7d9ddbbde3a3ce56451c8b708b0;hb=712eb32987872a6515e956246c0695fda032eb98;hpb=509599f043fd77c5eee595ebce117ff9e11a5324

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index b08db9f..a0b0343 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -123,8 +123,23 @@ static void logind_on_name_lost(GDBusConnection *conn,
  * this stops our GMainLoop sfaely before letting main() return */
 void logind_mem_clean() {
 
-    g_ptr_array_foreach(logind_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(logind_freeable, TRUE);
+    g_printf("exiting...\n");
+
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(logind_interf));
+
+    if(g_main_loop_is_running(logind_loop))
+        g_main_loop_quit(logind_loop);
+
+}
+
+/* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */
+gboolean unix_sig_terminate_handler(gpointer data) {
+
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
+
+    logind_mem_clean();
+    return G_SOURCE_REMOVE;
 }
 
 int main() {