[banshee/watcher: 72/72] Remove patched InotifyWatcher

[Alexander Kojevnikov <alexk src gnome org>]

commit 2c8444969558d28c64a762a4f7d02e93a6943828
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date:   Sat Dec 19 11:50:30 2009 +1100

    Remove patched InotifyWatcher
    
    Now that Mono 2.4.3 and 2.6 is out and includes the patch from bnc#322330
    we can finally remove the patched version of InotifyWatcher and all
    code it depends on.
    
    Makefiles still need to be updated to make sure the LibraryWatcher
    extension is not included if Mono version is less than 2.4.3

 data/addin-xml-strings.cs                          |    5 +
 .../Banshee.LibraryWatcher.csproj                  |   17 +-
 .../FileSystemWatcherProxy.cs                      |  146 -----
 .../Banshee.LibraryWatcher/IO/FileAction.cs        |   39 --
 .../Banshee.LibraryWatcher/IO/FileSystemWatcher.cs |  541 -----------------
 .../Banshee.LibraryWatcher/IO/IFileWatcher.cs      |   37 --
 .../Banshee.LibraryWatcher/IO/InotifyWatcher.cs    |  624 --------------------
 .../Banshee.LibraryWatcher/IO/SearchPattern.cs     |  225 -------
 .../Banshee.LibraryWatcher/SourceWatcher.cs        |    4 +-
 src/Extensions/Banshee.LibraryWatcher/Makefile.am  |    6 -
 10 files changed, 13 insertions(+), 1631 deletions(-)
---
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index 62028df..e3e4eae 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -113,6 +113,11 @@ internal static class AddinXmlStringCatalog
         Catalog.GetString (@"Provides tightly integrated Last.fm streaming radio and community features.");
         Catalog.GetString (@"User Interface");
 
+        // ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
+        Catalog.GetString (@"Library Watcher");
+        Catalog.GetString (@"Automatically update music and video libraries");
+        Catalog.GetString (@"Hardware");
+
         // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
         Catalog.GetString (@"Mini Mode");
         Catalog.GetString (@"Mini Mode allows controlling Banshee through a small window with only playback controls and track information.");
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
index ae55b3a..f0438eb 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
@@ -10,6 +10,9 @@
     <AssemblyName>Banshee.LibraryWatcher</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <ReleaseVersion>1.3</ReleaseVersion>
+    <RootNamespace>Banshee.LibraryWatcher</RootNamespace>
+    <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,7 +28,6 @@
         <Command type="Execute" command="make run" workingdir="${SolutionDir}" />
       </CustomCommands>
     </CustomCommands>
-    <AssemblyKeyFile>.</AssemblyKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Banshee.Core\Banshee.Core.csproj">
@@ -51,17 +53,13 @@
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Banshee.LibraryWatcher.addin.xml" />
+    <EmbeddedResource Include="Banshee.LibraryWatcher.addin.xml">
+      <LogicalName>Banshee.LibraryWatcher.addin.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Banshee.LibraryWatcher\LibraryWatcherService.cs" />
     <Compile Include="Banshee.LibraryWatcher\SourceWatcher.cs" />
-    <Compile Include="Banshee.LibraryWatcher\IO\FileSystemWatcher.cs" />
-    <Compile Include="Banshee.LibraryWatcher\IO\InotifyWatcher.cs" />
-    <Compile Include="Banshee.LibraryWatcher\IO\IFileWatcher.cs" />
-    <Compile Include="Banshee.LibraryWatcher\IO\FileAction.cs" />
-    <Compile Include="Banshee.LibraryWatcher\IO\SearchPattern.cs" />
-    <Compile Include="Banshee.LibraryWatcher\FileSystemWatcherProxy.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
@@ -79,7 +77,4 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
-  <ItemGroup>
-    <Folder Include="Banshee.LibraryWatcher\IO\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
index b2d1b35..c6159d1 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/SourceWatcher.cs
@@ -52,7 +52,7 @@ namespace Banshee.LibraryWatcher
     {
         private readonly LibraryImportManager import_manager;
         private readonly LibrarySource library;
-        private readonly FileSystemWatcherProxy watcher;
+        private readonly FileSystemWatcher watcher;
         private readonly ManualResetEvent handle;
         private readonly Thread watch_thread;
 
@@ -83,7 +83,7 @@ namespace Banshee.LibraryWatcher
 
             import_manager = ServiceManager.Get<LibraryImportManager> ();
 
-            watcher = new FileSystemWatcherProxy (path);
+            watcher = new FileSystemWatcher (path);
             watcher.IncludeSubdirectories = true;
             watcher.Changed += OnChanged;
             watcher.Created += OnChanged;
diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.am b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
index 64fbd62..67d22fe 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Makefile.am
+++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.am
@@ -4,12 +4,6 @@ LINK = $(REF_EXTENSION_LIBRARYWATCHER)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES =  \
-	Banshee.LibraryWatcher/FileSystemWatcherProxy.cs \
-	Banshee.LibraryWatcher/IO/FileAction.cs \
-	Banshee.LibraryWatcher/IO/FileSystemWatcher.cs \
-	Banshee.LibraryWatcher/IO/IFileWatcher.cs \
-	Banshee.LibraryWatcher/IO/InotifyWatcher.cs \
-	Banshee.LibraryWatcher/IO/SearchPattern.cs \
 	Banshee.LibraryWatcher/LibraryWatcherService.cs \
 	Banshee.LibraryWatcher/SourceWatcher.cs