[banshee] Moved SafeUri to Hyena.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Moved SafeUri to Hyena.
- Date: Sat, 7 Aug 2010 21:20:26 +0000 (UTC)
commit e812a714099a1aa57059602f74385e0bcce32af0
Author: Ruben Vermeersch <ruben savanne be>
Date: Sun Aug 1 15:36:46 2010 +0200
Moved SafeUri to Hyena.
This includes a namespace change: Banshee.Base.SafeUri is now Hyena.SafeUri.
Any code that uses SafeUri needs to be adjusted accordingly. Usually this
doesn't really require work though.
src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs | 2 +-
src/Core/Banshee.Core/Banshee.Base/SafeUri.cs | 209 --------------------
.../Banshee.Collection/FileTrackInfo.cs | 1 +
.../Banshee.Collection/IBasicTrackInfo.cs | 4 +-
.../Banshee.Collection/UnknownTrackInfo.cs | 2 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 1 -
.../Banshee.Core/Banshee.IO.SystemIO/Directory.cs | 2 +-
src/Core/Banshee.Core/Banshee.IO.SystemIO/File.cs | 2 +-
src/Core/Banshee.Core/Banshee.IO/Directory.cs | 2 +-
.../Banshee.IO/DirectoryScannerPipelineElement.cs | 3 +-
src/Core/Banshee.Core/Banshee.IO/File.cs | 2 +-
src/Core/Banshee.Core/Banshee.IO/IDirectory.cs | 2 +-
src/Core/Banshee.Core/Banshee.IO/IFile.cs | 2 +-
src/Core/Banshee.Core/Banshee.IO/Utilities.cs | 2 +-
.../Banshee.Core/Banshee.Streaming/StreamTagger.cs | 2 +-
src/Core/Banshee.Core/Makefile.am | 1 -
.../Banshee.Collection/RescanPipeline.cs | 1 +
.../Banshee.Database/BansheeDbFormatMigrator.cs | 2 +-
.../Banshee.Hardware/DeviceCommand.cs | 4 +-
.../Banshee.MediaEngine/IAudioCdRipper.cs | 3 +-
.../Banshee.MediaEngine/IBpmDetector.cs | 3 +-
.../Banshee.MediaEngine/ITranscoder.cs | 3 +-
.../Banshee.MediaEngine/NullPlayerEngine.cs | 2 +-
.../Banshee.Metadata.Embedded/EmbeddedQueryJob.cs | 2 +
.../Banshee.Metadata/MetadataServiceJob.cs | 4 +-
.../Banshee.Metadata/SaveTrackMetadataJob.cs | 2 +-
.../Banshee.Playlist/PlaylistFileUtil.cs | 2 +-
.../Banshee.Services/Banshee.Web/HttpRequest.cs | 3 +-
.../Banshee.Collection.Gui/ColumnCellLocation.cs | 2 +-
.../Banshee.Dap.Karma/KarmaTrackInfo.cs | 2 +-
.../Banshee.Dap.Mtp/MtpTrackInfo.cs | 3 +-
.../Banshee.AudioCd/AudioCdRipper.cs | 2 +-
.../Banshee.AudioCd/AudioCdTrackInfo.cs | 3 +-
.../Banshee.Daap/Banshee.Daap/DaapTrackInfo.cs | 2 +-
.../Banshee.InternetArchive/DetailsView.cs | 2 +-
.../NotificationAreaService.cs | 3 +-
.../ItunesPlayerImportDialogs.cs | 2 +-
.../RhythmboxPlayerImportSource.cs | 2 +-
.../Banshee.Podcasting.Data/PodcastTrackInfo.cs | 3 +-
src/Hyena | 2 +-
40 files changed, 51 insertions(+), 247 deletions(-)
---
diff --git a/src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs b/src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs
index 2b19c25..bd2d583 100644
--- a/src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs
+++ b/src/Backends/Banshee.Unix/Banshee.IO.Unix/File.cs
@@ -31,7 +31,7 @@ using System.IO;
using Mono.Unix;
using Mono.Unix.Native;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO.Unix
{
diff --git a/src/Core/Banshee.Core/Banshee.Collection/FileTrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/FileTrackInfo.cs
index 275c4aa..45160b9 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/FileTrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/FileTrackInfo.cs
@@ -32,6 +32,7 @@ using System.Threading;
using System.Collections;
using System.Text.RegularExpressions;
+using Hyena;
using Banshee.Base;
namespace Banshee.Collection
diff --git a/src/Core/Banshee.Core/Banshee.Collection/IBasicTrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/IBasicTrackInfo.cs
index 0612104..619ce80 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/IBasicTrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/IBasicTrackInfo.cs
@@ -26,6 +26,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using Hyena;
+
namespace Banshee.Collection
{
public interface IBasicTrackInfo
@@ -35,7 +37,7 @@ namespace Banshee.Collection
string AlbumTitle { get; }
string TrackTitle { get; }
string ArtworkId { get; }
- Banshee.Base.SafeUri Uri { get; }
+ SafeUri Uri { get; }
TrackMediaAttributes MediaAttributes { get; }
}
}
diff --git a/src/Core/Banshee.Core/Banshee.Collection/UnknownTrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/UnknownTrackInfo.cs
index 9cd7c48..4c7043f 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/UnknownTrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/UnknownTrackInfo.cs
@@ -28,7 +28,7 @@
using System;
-using Banshee.Base;
+using Hyena;
namespace Banshee.Collection
{
diff --git a/src/Core/Banshee.Core/Banshee.Core.csproj b/src/Core/Banshee.Core/Banshee.Core.csproj
index e05db11..b8e5f88 100644
--- a/src/Core/Banshee.Core/Banshee.Core.csproj
+++ b/src/Core/Banshee.Core/Banshee.Core.csproj
@@ -109,7 +109,6 @@
<Compile Include="Banshee.Configuration\SchemaEntry.cs" />
<Compile Include="Banshee.Base\FileNamePattern.cs" />
<Compile Include="Banshee.Base\PathPattern.cs" />
- <Compile Include="Banshee.Base\SafeUri.cs" />
<Compile Include="Banshee.Base\LegacyPaths.cs" />
<Compile Include="Banshee.Collection\AlbumInfo.cs" />
<Compile Include="Banshee.Collection\ArtistInfo.cs" />
diff --git a/src/Core/Banshee.Core/Banshee.IO.SystemIO/Directory.cs b/src/Core/Banshee.Core/Banshee.IO.SystemIO/Directory.cs
index fe8fe2b..02a2e91 100644
--- a/src/Core/Banshee.Core/Banshee.IO.SystemIO/Directory.cs
+++ b/src/Core/Banshee.Core/Banshee.IO.SystemIO/Directory.cs
@@ -29,7 +29,7 @@
using System;
using System.Collections.Generic;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO.SystemIO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO.SystemIO/File.cs b/src/Core/Banshee.Core/Banshee.IO.SystemIO/File.cs
index 140c2bb..d3f8675 100644
--- a/src/Core/Banshee.Core/Banshee.IO.SystemIO/File.cs
+++ b/src/Core/Banshee.Core/Banshee.IO.SystemIO/File.cs
@@ -29,7 +29,7 @@
using System;
using System.IO;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO.SystemIO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO/Directory.cs b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
index cbd12fd..0fb479c 100644
--- a/src/Core/Banshee.Core/Banshee.IO/Directory.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/Directory.cs
@@ -29,7 +29,7 @@
using System;
using System.Collections.Generic;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs b/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
index 094f88a..80da60a 100644
--- a/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
@@ -30,10 +30,9 @@ using System;
using System.Collections.Generic;
using System.IO;
+using Hyena;
using Hyena.Collections;
-using Banshee.Base;
-
namespace Banshee.IO
{
public class DirectoryScannerPipelineElement : QueuePipelineElement<string>
diff --git a/src/Core/Banshee.Core/Banshee.IO/File.cs b/src/Core/Banshee.Core/Banshee.IO/File.cs
index f5785c2..933e0dd 100644
--- a/src/Core/Banshee.Core/Banshee.IO/File.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/File.cs
@@ -28,7 +28,7 @@
using System;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO/IDirectory.cs b/src/Core/Banshee.Core/Banshee.IO/IDirectory.cs
index 495caf8..5d14945 100644
--- a/src/Core/Banshee.Core/Banshee.IO/IDirectory.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/IDirectory.cs
@@ -29,7 +29,7 @@
using System;
using System.Collections.Generic;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO/IFile.cs b/src/Core/Banshee.Core/Banshee.IO/IFile.cs
index 465acc3..708b425 100644
--- a/src/Core/Banshee.Core/Banshee.IO/IFile.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/IFile.cs
@@ -28,7 +28,7 @@
using System;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO
{
diff --git a/src/Core/Banshee.Core/Banshee.IO/Utilities.cs b/src/Core/Banshee.Core/Banshee.IO/Utilities.cs
index 2f73520..87629f8 100644
--- a/src/Core/Banshee.Core/Banshee.IO/Utilities.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/Utilities.cs
@@ -28,7 +28,7 @@
using System;
-using Banshee.Base;
+using Hyena;
namespace Banshee.IO
{
diff --git a/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs b/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
index ad63389..020826d 100644
--- a/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
+++ b/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
@@ -29,8 +29,8 @@
using System;
using System.Text.RegularExpressions;
+using Hyena;
using Banshee.IO;
-using Banshee.Base;
using Banshee.Collection;
namespace Banshee.Streaming
diff --git a/src/Core/Banshee.Core/Makefile.am b/src/Core/Banshee.Core/Makefile.am
index 9884a0c..3c8de92 100644
--- a/src/Core/Banshee.Core/Makefile.am
+++ b/src/Core/Banshee.Core/Makefile.am
@@ -11,7 +11,6 @@ SOURCES = \
Banshee.Base/PlatformHacks.cs \
Banshee.Base/ProductInformation.cs \
Banshee.Base/Resource.cs \
- Banshee.Base/SafeUri.cs \
Banshee.Base/Tests/CoverArtSpecTests.cs \
Banshee.Collection/AlbumInfo.cs \
Banshee.Collection/ArtistInfo.cs \
diff --git a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
index 9b4517c..2f33432 100644
--- a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
@@ -31,6 +31,7 @@ using System.Data;
using Mono.Unix;
+using Hyena;
using Hyena.Jobs;
using Hyena.Collections;
using Hyena.Data.Sqlite;
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
index fad72fe..908f43f 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
@@ -1452,7 +1452,7 @@ namespace Banshee.Database
string library_path = (string)args[0];
string filename_fragment = (string)args[1];
string full_path = Paths.Combine (library_path, filename_fragment);
- return Banshee.Base.SafeUri.FilenameToUri (full_path);
+ return SafeUri.FilenameToUri (full_path);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Hardware/DeviceCommand.cs b/src/Core/Banshee.Services/Banshee.Hardware/DeviceCommand.cs
index 7b13a41..c110a53 100644
--- a/src/Core/Banshee.Services/Banshee.Hardware/DeviceCommand.cs
+++ b/src/Core/Banshee.Services/Banshee.Hardware/DeviceCommand.cs
@@ -28,7 +28,7 @@
using System;
-using Banshee.Base;
+using Hyena;
namespace Banshee.Hardware
{
@@ -88,7 +88,7 @@ namespace Banshee.Hardware
// HAL UDIs from the GIO URI that we were likely given by Nautilus
try {
- Banshee.Base.SafeUri uri = new Banshee.Base.SafeUri (argument);
+ SafeUri uri = new SafeUri (argument);
d_command.device_id = uri.IsLocalPath ? uri.LocalPath : argument;
} catch {
d_command.device_id = argument;
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/IAudioCdRipper.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/IAudioCdRipper.cs
index 8feb756..e391961 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/IAudioCdRipper.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/IAudioCdRipper.cs
@@ -28,7 +28,8 @@
using System;
-using Banshee.Base;
+using Hyena;
+
using Banshee.Collection;
namespace Banshee.MediaEngine
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/IBpmDetector.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/IBpmDetector.cs
index a5aabfc..bb53279 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/IBpmDetector.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/IBpmDetector.cs
@@ -28,7 +28,8 @@
using System;
-using Banshee.Base;
+using Hyena;
+
using Banshee.MediaProfiles;
using Banshee.Collection;
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/ITranscoder.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/ITranscoder.cs
index 17f19de..3b5625a 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/ITranscoder.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/ITranscoder.cs
@@ -28,7 +28,8 @@
using System;
-using Banshee.Base;
+using Hyena;
+
using Banshee.MediaProfiles;
using Banshee.Collection;
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
index a437ade..32a846b 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
@@ -29,7 +29,7 @@
using System;
using System.Collections;
-using Banshee.Base;
+using Hyena;
namespace Banshee.MediaEngine
{
diff --git a/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs b/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs
index 3b6a5eb..9213e98 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata.Embedded/EmbeddedQueryJob.cs
@@ -30,6 +30,8 @@ using System;
using System.IO;
using System.Collections.Generic;
+using Hyena;
+
using TagLib;
using Banshee.Base;
diff --git a/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs b/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
index 5e658fd..810cacb 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
@@ -31,8 +31,10 @@ using System.IO;
using System.Net;
using System.Collections.Generic;
-using Banshee.Kernel;
+using Hyena;
+
using Banshee.Base;
+using Banshee.Kernel;
using Banshee.Collection;
using Banshee.Streaming;
using Banshee.Networking;
diff --git a/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs b/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
index 77f993a..6709b71 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs
@@ -32,10 +32,10 @@ using System;
using System.Linq;
using Mono.Unix;
+using Hyena;
using Hyena.Jobs;
using Hyena.Data.Sqlite;
-using Banshee.Base;
using Banshee.Streaming;
using Banshee.Collection.Database;
using Banshee.Library;
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
index 0654104..0b1aea2 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
@@ -5,9 +5,9 @@ using System.Threading;
using Mono.Unix;
+using Hyena;
using Hyena.Data.Sqlite;
-using Banshee.Base;
using Banshee.Configuration;
using Banshee.ServiceStack;
using Banshee.Database;
diff --git a/src/Core/Banshee.Services/Banshee.Web/HttpRequest.cs b/src/Core/Banshee.Services/Banshee.Web/HttpRequest.cs
index d96ba49..39c6c13 100644
--- a/src/Core/Banshee.Services/Banshee.Web/HttpRequest.cs
+++ b/src/Core/Banshee.Services/Banshee.Web/HttpRequest.cs
@@ -33,7 +33,8 @@ using System.Collections.Generic;
using ICSharpCode.SharpZipLib.GZip;
-using Banshee.Base;
+using Hyena;
+
using Banshee.ServiceStack;
using Banshee.Networking;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellLocation.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellLocation.cs
index 0733d70..ce42bb2 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellLocation.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellLocation.cs
@@ -28,8 +28,8 @@
using System;
+using Hyena;
using Hyena.Data.Gui;
-using Banshee.Base;
namespace Banshee.Collection.Gui
{
diff --git a/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaTrackInfo.cs b/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaTrackInfo.cs
index fd601ea..ab1eff8 100644
--- a/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaTrackInfo.cs
+++ b/src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma/KarmaTrackInfo.cs
@@ -1,6 +1,6 @@
using System;
+using Hyena;
using KarmaLib=Karma;
-using Banshee.Base;
using Banshee.Collection.Database;
namespace Banshee.Dap.Karma
diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs
index 935d245..3128e61 100644
--- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs
+++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpTrackInfo.cs
@@ -29,7 +29,8 @@
using System;
using System.IO;
-using Banshee.Base;
+using Hyena;
+
using Banshee.Collection;
using Banshee.Collection.Database;
using Banshee.ServiceStack;
diff --git a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
index aff9f0e..0f748c1 100644
--- a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
+++ b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
@@ -32,9 +32,9 @@ using System.Collections.Generic;
using Mono.Unix;
using Mono.Addins;
+using Hyena;
using Hyena.Jobs;
-using Banshee.Base;
using Banshee.Library;
using Banshee.ServiceStack;
using Banshee.Streaming;
diff --git a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdTrackInfo.cs b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdTrackInfo.cs
index 67a8631..68e6a26 100644
--- a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdTrackInfo.cs
+++ b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdTrackInfo.cs
@@ -28,7 +28,8 @@
using System;
-using Banshee.Base;
+using Hyena;
+
using Banshee.Collection;
using Banshee.Collection.Database;
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapTrackInfo.cs b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapTrackInfo.cs
index 183c89e..bdf1b33 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapTrackInfo.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapTrackInfo.cs
@@ -28,8 +28,8 @@
using System;
using Mono.Unix;
+using Hyena;
-using Banshee.Base;
using Banshee.Collection;
using Banshee.Collection.Database;
using Daap;
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
index 9ebfe8e..59fdd27 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs
@@ -33,6 +33,7 @@ using System.Linq;
using Mono.Unix;
using Gtk;
+using Hyena;
using Hyena.Collections;
using Hyena.Data.Sqlite;
@@ -40,7 +41,6 @@ using Hyena.Data;
using Hyena.Data.Gui;
using Hyena.Widgets;
-using Banshee.Base;
using Banshee.Collection;
using Banshee.Collection.Gui;
using Banshee.Collection.Database;
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index 34b905b..cd38f9c 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -35,6 +35,7 @@ using Mono.Unix;
using Notifications;
+using Banshee.Base;
using Banshee.Collection;
using Banshee.Collection.Database;
using Banshee.ServiceStack;
@@ -44,8 +45,8 @@ using Banshee.Collection.Gui;
using Banshee.MediaEngine;
using Banshee.IO;
-using Banshee.Base;
+using Hyena;
using Hyena.Gui;
using Hyena.Widgets;
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
index b226ff4..1aaf514 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs
@@ -31,7 +31,7 @@ using System.IO;
using Gtk;
using Mono.Unix;
-using Banshee.Base;
+using Hyena;
namespace Banshee.PlayerMigration
{
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
index 0e7a17f..87f5d52 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs
@@ -35,9 +35,9 @@ using System.Xml;
using Mono.Unix;
+using Hyena;
using Hyena.Data.Sqlite;
-using Banshee.Base;
using Banshee.Collection.Database;
using Banshee.Library;
using Banshee.ServiceStack;
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs
index 27ddf1b..d565ead 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs
@@ -32,6 +32,7 @@ using Mono.Unix;
using System.Collections.Generic;
+using Hyena;
using Hyena.Data.Sqlite;
using Banshee.MediaEngine;
@@ -203,7 +204,7 @@ namespace Banshee.Podcasting.Data
track.Duration = Item.Enclosure.Duration;
track.FileSize = Item.Enclosure.FileSize;
track.LicenseUri = Item.LicenseUri;
- track.Uri = new Banshee.Base.SafeUri (Item.Enclosure.LocalPath ?? Item.Enclosure.Url);
+ track.Uri = new SafeUri (Item.Enclosure.LocalPath ?? Item.Enclosure.Url);
if (!String.IsNullOrEmpty (Item.Enclosure.LocalPath)) {
try {
diff --git a/src/Hyena b/src/Hyena
index 9354c35..573802e 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 9354c35d6f79f67ea37f53020b16dfd3dbadcfcf
+Subproject commit 573802e3e3724e0ca478da07cff84bd981cb2cf1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]