banshee r4545 - in trunk/banshee: . src/Clients/Beroe/Beroe src/Core/Banshee.Services/Banshee.Collection.Indexer

[abock svn gnome org]

Author: abock
Date: Mon Sep 15 19:20:53 2008
New Revision: 4545
URL: http://svn.gnome.org/viewvc/banshee?rev=4545&view=rev

Log:
2008-09-15  Aaron Bockover  <abock gnome org>

    * src/Clients/Beroe/Beroe/IndexerClient.cs: Call ForceShutdown on the
    collection indexer service after 2.5 seconds to kick off anyone that
    did not respect the CleanupAndShutdown signal

    * src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs:
    Implemented a ForceShutdown method

:

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Beroe/Beroe/IndexerClient.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs

Modified: trunk/banshee/src/Clients/Beroe/Beroe/IndexerClient.cs
==============================================================================
--- trunk/banshee/src/Clients/Beroe/Beroe/IndexerClient.cs	(original)
+++ trunk/banshee/src/Clients/Beroe/Beroe/IndexerClient.cs	Mon Sep 15 19:20:53 2008
@@ -128,6 +128,10 @@
                 Log.Debug ("Banshee will be started when the indexer finishes. Notifying indexer that it should hurry!");
                 reboot_args = args;
                 ServiceManager.Get<CollectionIndexerService> ().RequestCleanupAndShutdown ();
+                GLib.Timeout.Add (2500, delegate {
+                    ServiceManager.Get<CollectionIndexerService> ().ForceShutdown ();
+                    return false;
+                });
             }
         }
         

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs	Mon Sep 15 19:20:53 2008
@@ -90,6 +90,14 @@
             }
         }
         
+        public void ForceShutdown ()
+        {
+            Dispose ();
+            if (shutdown_handler != null) {
+                shutdown_handler ();
+            }
+        }
+        
         public ICollectionIndexer CreateIndexer ()
         {
             lock (this) {