(5) fix foo_mem_clean() functions to avoid race cond.

[systembsd.git] / src / interfaces / localed / localed.c

diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
index 10ae7b714337f44bd60f796f908f4e1cdbabed4f..e2fd3f44d201abac9780879291b5dfa396211c27 100644 (file)
--- a/src/interfaces/localed/localed.c
+++ b/src/interfaces/localed/localed.c
@@ -123,8 +123,14 @@ static void localed_on_name_lost(GDBusConnection *conn,
  * this stops our GMainLoop safely before letting main() return */
 void localed_mem_clean() {
 
-    g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL);
-       g_ptr_array_free(localed_freeable, TRUE);
+       g_printf("exiting...\n");
+
+       if(dbus_interface_exported)
+               g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+
+       if(g_main_loop_is_running(localed_loop))
+               g_main_loop_quit(localed_loop);
+
 }
 
 int main() {