banshee r4516 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection.Indexer src/Libraries/Hyena src/Libraries/Hyena/Hyena

[abock svn gnome org]

Author: abock
Date: Thu Sep 11 20:56:10 2008
New Revision: 4516
URL: http://svn.gnome.org/viewvc/banshee?rev=4516&view=rev

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

    * src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs:
    * src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs:
    * src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs:
    * src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs:
    Use Hyena.Action instead of System.Action

    * src/Libraries/Hyena/Hyena/Delegates.cs: Implement Hyena.Action delegate



Added:
   trunk/banshee/src/Libraries/Hyena/Hyena/Delegates.cs
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexerService.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.csproj
   trunk/banshee/src/Libraries/Hyena/Makefile.am

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs	Thu Sep 11 20:56:10 2008
@@ -51,8 +51,8 @@
         private List<CachedList<DatabaseTrackInfo>> model_caches = new List<CachedList<DatabaseTrackInfo>> ();
         private string [] export_fields;
         
-        private event Action indexing_finished;
-        event Action ICollectionIndexer.IndexingFinished {
+        private event Hyena.Action indexing_finished;
+        event Hyena.Action ICollectionIndexer.IndexingFinished {
             add { indexing_finished += value; }
             remove { indexing_finished -= value; }
         }
@@ -240,7 +240,7 @@
                 handler (this, EventArgs.Empty);
             }
         
-            Action dbus_handler = indexing_finished;
+            Hyena.Action dbus_handler = indexing_finished;
             if (dbus_handler != null) {
                 dbus_handler ();
             }

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	Thu Sep 11 20:56:10 2008
@@ -48,10 +48,10 @@
         private string [] available_export_fields;
         private int open_indexers;
         
-        public event Action CollectionChanged;
+        public event Hyena.Action CollectionChanged;
         
-        private Action shutdown_handler;
-        public Action ShutdownHandler {
+        private Hyena.Action shutdown_handler;
+        public Hyena.Action ShutdownHandler {
             get { return shutdown_handler; }
             set { shutdown_handler = value; }
         }
@@ -211,7 +211,7 @@
         
         private void OnCollectionChanged ()
         {
-            Action handler = CollectionChanged;
+            Hyena.Action handler = CollectionChanged;
             if (handler != null) {
                 handler ();
             }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexer.cs	Thu Sep 11 20:56:10 2008
@@ -39,7 +39,7 @@
     [Interface ("org.bansheeproject.CollectionIndexer.Indexer")]
     public interface ICollectionIndexer : IService, IDBusExportable
     {
-        event Action IndexingFinished;
+        event Hyena.Action IndexingFinished;
         event SaveToXmlFinishedHandler SaveToXmlFinished;
         
         void Index ();

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Indexer/ICollectionIndexerService.cs	Thu Sep 11 20:56:10 2008
@@ -36,7 +36,7 @@
     [Interface ("org.bansheeproject.CollectionIndexer.Service")]
     public interface ICollectionIndexerService : IService, IDBusExportable
     {
-        event Action CollectionChanged;
+        event Hyena.Action CollectionChanged;
         void Hello ();
         void Shutdown ();
         ObjectPath CreateIndexer ();

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.csproj
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.csproj	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.csproj	Thu Sep 11 20:56:10 2008
@@ -128,6 +128,7 @@
     <Compile Include="Hyena.Json\Deserializer.cs" />
     <Compile Include="Hyena.Json\IJsonCollection.cs" />
     <Compile Include="Hyena.Json\Tests\DeserializerTests.cs" />
+    <Compile Include="Hyena\Delegates.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>

Added: trunk/banshee/src/Libraries/Hyena/Hyena/Delegates.cs
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Libraries/Hyena/Hyena/Delegates.cs	Thu Sep 11 20:56:10 2008
@@ -0,0 +1,32 @@
+//
+// Delegates.cs
+//
+// Author:
+//   Aaron Bockover <abockover novell com>
+//
+// Copyright (C) 2008 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace Hyena
+{
+    public delegate void Action ();
+}

Modified: trunk/banshee/src/Libraries/Hyena/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Makefile.am	(original)
+++ trunk/banshee/src/Libraries/Hyena/Makefile.am	Thu Sep 11 20:56:10 2008
@@ -96,6 +96,7 @@
 	Hyena/ConsoleCrayon.cs \
 	Hyena/CryptoUtil.cs \
 	Hyena/DateTimeUtil.cs \
+	Hyena/Delegates.cs \
 	Hyena/IUndoAction.cs \
 	Hyena/Log.cs \
 	Hyena/StringUtil.cs \