From 8c5d70c411d3b7f0c0622e0a73567e83b2745249 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Sat, 20 Apr 2013 21:10:00 +1000
Subject: Adds remaining shutdown infrastructure and call from cdda backend.

https://bugzilla.gnome.org/show_bug.cgi?id=511802
---
 daemon/daemon-main.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'daemon/daemon-main.c')

diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index de007b09..4b2d5419 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -312,6 +312,14 @@ on_name_lost (GDBusConnection *connection,
   g_main_loop_quit (loop);
 }
 
+static void
+daemon_shutdown (GVfsDaemon *daemon,
+		 GMainLoop  *loop)
+{
+  if (g_main_loop_is_running (loop))
+    g_main_loop_quit (loop);
+}
+
 static void
 on_name_acquired (GDBusConnection *connection,
                   const gchar     *name,
@@ -329,6 +337,8 @@ on_name_acquired (GDBusConnection *connection,
     }
 
   g_vfs_daemon_set_max_threads (data->daemon, data->max_job_threads);
+  g_signal_connect (data->daemon, "shutdown",
+		    G_CALLBACK (daemon_shutdown), loop);
 
   send_spawned (TRUE, NULL, 0, spawned_succeeded_cb, data);
 }
@@ -391,7 +401,7 @@ daemon_main (int argc,
     {
       g_idle_add (do_name_acquired, data);
     }
-  
+
   g_main_loop_run (loop);
   
   g_clear_object (&data->daemon);
-- 
cgit v1.2.1