[banshee] Logging: bring latest hyena (& kill majority of warnings from it)
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Logging: bring latest hyena (& kill majority of warnings from it)
- Date: Thu, 17 Jul 2014 17:27:11 +0000 (UTC)
commit 7f7a27ecf253eed9a9e3091ec26b6a2701cb876f
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Thu Jul 17 19:27:03 2014 +0200
Logging: bring latest hyena (& kill majority of warnings from it)
Latest change in hyena is the deprecation of Log.Exception() methods
because of its severity ambiguity. To fix the warnings generated by
this deprecation, I've taken this rule of thumb:
- If the exception being logged comes from a generic catch(Exception)
it's probably a way to avoid that Banshee crashes, and having a generic
Exception type (instead of a more specific one, i.e. FormatException)
most likely means that the reason for the exception is unknown, so it's
convenient to file this as an error. If any of this particular cases
becomes frequent enough, we can always look at the stacktrace, and put
a more specific catch() block that uses Log.Warning() in the future.
- If the exception being logged comes from a specific catch block of
a specific exception type (derived from System.Exception) it normally
corresponds to a non-severe problem that can be ignored, but logged as
a warning.
.../Banshee.GStreamer/BpmDetector.cs | 2 +-
.../Banshee.GStreamer/PlayerEngine.cs | 4 ++--
.../Banshee.GStreamerSharp/BpmDetector.cs | 4 ++--
.../Banshee.GStreamerSharp/Visualization.cs | 2 +-
.../Banshee.Hardware.Gio/LowLevel/RawVolume.cs | 2 +-
.../Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs | 3 ++-
.../Banshee.GnomeBackend/DiscDuplicator.cs | 4 ++--
.../GConfConfigurationClient.cs | 4 ++--
.../Banshee.GnomeBackend/GnomeService.cs | 2 +-
src/Clients/Booter/Booter/Entry.cs | 4 ++--
.../Banshee.Core/Banshee.Collection/TrackInfo.cs | 2 +-
.../Banshee.IO/DirectoryScannerPipelineElement.cs | 8 ++++----
src/Core/Banshee.Core/Banshee.Kernel/Scheduler.cs | 2 +-
.../Banshee.Collection.Database/Shuffler.cs | 2 +-
.../CollectionIndexer.cs | 2 +-
.../Banshee.Collection/ImportManager.cs | 2 +-
.../Banshee.Collection/RescanPipeline.cs | 2 +-
.../DefaultApplicationHelper.cs | 2 +-
.../Banshee.Database/BansheeDbConnection.cs | 2 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 6 +++---
.../Banshee.Equalizer/EqualizerManager.cs | 8 ++++----
.../Banshee.Hardware/HardwareManager.cs | 4 ++--
.../Banshee.MediaEngine/PlayerEngine.cs | 2 +-
.../Banshee.MediaEngine/PlayerEngineService.cs | 4 ++--
.../FileSystemQueryJob.cs | 2 +-
.../Banshee.Metadata.LastFM/LastFMQueryJob.cs | 2 +-
.../Banshee.Metadata/MetadataServiceJob.cs | 4 ++--
.../Banshee.Metrics/BansheeMetrics.cs | 2 +-
.../Banshee.PlatformServices/ScreensaverManager.cs | 2 +-
.../Banshee.Playlist/PlaylistFileUtil.cs | 6 +++---
.../Banshee.ServiceStack/DBusConnection.cs | 2 +-
.../Banshee.ServiceStack/DbIteratorJob.cs | 2 +-
.../Banshee.ServiceStack/ServiceManager.cs | 10 +++++-----
.../Banshee.Sources/PrimarySource.cs | 4 ++--
.../Banshee.Sources/SourceManager.cs | 2 +-
.../Banshee.Streaming/RadioTrackInfo.cs | 8 ++++----
.../Banshee.Services/Banshee.Web/BaseHttpServer.cs | 4 ++--
.../Banshee.Collection.Gui/ArtworkManager.cs | 2 +-
.../Banshee.Collection.Gui/CoverArtEditor.cs | 8 ++++----
.../Banshee.Gui.TrackEditor/EditorTrackInfo.cs | 4 ++--
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 5 +++--
.../Banshee.Gui.Widgets/TaskStatusIcon.cs | 2 +-
.../Banshee.Gui/BaseClientWindow.cs | 4 ++--
.../Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs | 2 +-
.../Banshee.Gui/GtkBaseClient.cs | 2 +-
.../Banshee.Gui/InterfaceActionService.cs | 2 +-
.../Banshee.Gui/TrackActions.cs | 2 +-
.../Banshee.Dap.AppleDevice/AppleDeviceSource.cs | 18 +++++++++---------
.../AppleDeviceTrackInfo.cs | 2 +-
.../Banshee.Dap.MassStorage/MassStorageDevice.cs | 2 +-
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 8 ++++----
.../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs | 6 +++---
src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs | 2 +-
src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs | 10 +++++-----
src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs | 4 ++--
src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs | 2 +-
.../Banshee.AmazonMp3/AmazonDownloadManager.cs | 2 +-
.../AmazonMp3DownloaderService.cs | 2 +-
.../Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs | 2 +-
.../Banshee.CoverArt/CoverArtJob.cs | 2 +-
.../Banshee.Daap/DaapProxyWebServer.cs | 5 +++--
.../Banshee.Daap/Banshee.Daap/DaapService.cs | 2 +-
.../Banshee.Daap/Banshee.Daap/DaapSource.cs | 4 ++--
.../Banshee.Fixup/Banshee.Fixup/ProblemModel.cs | 2 +-
.../Banshee.InternetArchive/DetailsSource.cs | 2 +-
.../Banshee.InternetArchive/SearchSource.cs | 4 ++--
.../Banshee.InternetRadio/XspfMigrator.cs | 8 ++++----
.../RecommendationPane.cs | 2 +-
.../Banshee.Lastfm/LastfmSourceContents.cs | 2 +-
.../LibraryWatcherService.cs | 4 +++-
.../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs | 4 ++--
.../NotificationAreaService.cs | 2 +-
.../Banshee.NowPlaying/FullscreenAdapter.cs | 6 +++---
.../Banshee.OpticalDisc.AudioCd/AudioCdSource.cs | 4 ++--
.../Banshee.OpticalDisc/DiscService.cs | 2 +-
.../Banshee.OpticalDisc/DiscSource.cs | 2 +-
.../AmarokPlayerImportSource.cs | 4 ++--
.../Banshee.Podcasting/PodcastService.cs | 6 +++---
src/Hyena | 2 +-
src/Libraries/Lastfm/Lastfm/Account.cs | 4 ++--
.../Lastfm/Lastfm/AudioscrobblerConnection.cs | 6 +++---
src/Libraries/Lastfm/Lastfm/RadioConnection.cs | 2 +-
.../Migo/Migo.Syndication/EnclosureManager.cs | 12 ++++++------
src/Libraries/Migo/Migo.Syndication/Feed.cs | 2 +-
.../Migo/Migo.Syndication/FeedUpdateTask.cs | 4 ++--
src/Libraries/Migo/Migo.Syndication/RssParser.cs | 14 +++++++-------
.../AsyncCommandQueue/AsyncCommandQueue.cs | 6 ++++--
src/Libraries/Migo/Migo.TaskCore/TaskGroup.cs | 6 ++++--
88 files changed, 178 insertions(+), 169 deletions(-)
---
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
index 652ce84..48e497b 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/BpmDetector.cs
@@ -106,7 +106,7 @@ namespace Banshee.GStreamer
Log.DebugFormat ("GStreamer running beat detection on {0}", path);
bbd_process_file (handle, path_ptr);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
} finally {
GLib.Marshaller.Free (path_ptr);
}
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index 6a058c0..d5cac74 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@ -608,7 +608,7 @@ namespace Banshee.GStreamer
try {
handler (cbd, new float[][] { spec });
} catch (Exception e) {
- Log.Exception ("Uncaught exception during visualization data post.", e);
+ Log.Error ("Uncaught exception during visualization data post.", e);
}
}
@@ -857,7 +857,7 @@ namespace Banshee.GStreamer
clutter_video_texture = IntPtr.Zero;
}
} catch (Exception e) {
- Log.Exception ("Clutter support could not be initialized", e);
+ Log.Error ("Clutter support could not be initialized", e);
clutter_video_sink = IntPtr.Zero;
clutter_video_texture = IntPtr.Zero;
clutter_video_sink_enabled = false;
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/BpmDetector.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/BpmDetector.cs
index 586ed2d..2291db0 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/BpmDetector.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/BpmDetector.cs
@@ -104,7 +104,7 @@ namespace Banshee.GStreamerSharp
}
pipeline.Bus.AddWatch (OnBusMessage);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
throw new ApplicationException (Catalog.GetString ("Could not create BPM detection
driver."), e);
}
}
@@ -201,7 +201,7 @@ namespace Banshee.GStreamerSharp
filesrc ["location"] = path;
pipeline.SetState (State.Playing);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
index 0b8cd7f..c12f168 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/Visualization.cs
@@ -287,7 +287,7 @@ namespace Banshee.GStreamerSharp
try {
OnDataAvailable (cbd, new float[][] { spec });
} catch (System.Exception e) {
- Log.Exception ("Uncaught exception during visualization data post.", e);
+ Log.Error ("Uncaught exception during visualization data post.", e);
}
vis_buffer.Flush ((uint)wanted_size);
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
index 7277ce9..a7b084a 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
@@ -163,7 +163,7 @@ namespace Banshee.Hardware.Gio
Hyena.Log.ErrorFormat ("Failed to eject {0}", Volume.Name);
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Hyena.Log.Error (e);
}
});
}
diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
index 206c3d3..a8916b5 100644
--- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
+++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
@@ -101,7 +101,8 @@ namespace Banshee.GnomeBackend
try {
Run (file_args.ToString ());
} catch (Exception e) {
- Log.Exception ("Problem starting Brasero", e);
+ Log.Error ("Problem starting Brasero", e);
+
Log.Error (Catalog.GetString ("Could not write CD"),
Catalog.GetString ("Brasero could not be started"), true);
}
diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/DiscDuplicator.cs
b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/DiscDuplicator.cs
index 7bd7b4a..c283b8f 100644
--- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/DiscDuplicator.cs
+++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/DiscDuplicator.cs
@@ -55,7 +55,7 @@ namespace Banshee.GnomeBackend
try {
gnome.Brasero.Run (String.Format ("-c {0}", device));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
return false;
}
@@ -68,7 +68,7 @@ namespace Banshee.GnomeBackend
System.Diagnostics.Process.Start ("nautilus-cd-burner",
String.Format ("--source-device={0}", device));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
return false;
}
diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
index 25bbd21..3082c60 100644
--- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
+++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GConfConfigurationClient.cs
@@ -115,7 +115,7 @@ namespace Banshee.GnomeBackend
return true;
} catch (GConf.NoSuchKeyException) {
} catch (Exception e) {
- Log.Exception (String.Format ("Could not read GConf key {0}.{1}", @namespace, key), e);
+ Log.Error (String.Format ("Could not read GConf key {0}.{1}", @namespace, key), e);
}
result = default (T);
@@ -137,7 +137,7 @@ namespace Banshee.GnomeBackend
try {
client.Set (CreateKey (@namespace, key), value);
} catch (Exception e) {
- Log.Exception (String.Format ("Could not set GConf key {0}.{1}.", @namespace, key), e);
+ Log.Error (String.Format ("Could not set GConf key {0}.{1}.", @namespace, key), e);
}
}
}
diff --git a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
index b6a18f0..96f5634 100644
--- a/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
+++ b/src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeService.cs
@@ -52,7 +52,7 @@ namespace Banshee.GnomeBackend
// FIXME: this needs to be deferred/delayed initialized
gconf_proxy = new GConfProxy ();
} catch (Exception e) {
- Hyena.Log.Exception ("GConfProxy", e);
+ Hyena.Log.Error ("Problem initializing GConfProxy", e);
gconf_proxy = null;
}
diff --git a/src/Clients/Booter/Booter/Entry.cs b/src/Clients/Booter/Booter/Entry.cs
index 3157e13..4c5738e 100644
--- a/src/Clients/Booter/Booter/Entry.cs
+++ b/src/Clients/Booter/Booter/Entry.cs
@@ -91,7 +91,7 @@ namespace Booter
indexer.RebootWhenFinished (Environment.GetCommandLineArgs ());
Log.Warning ("The Banshee indexer is currently running. Banshee will be started when the
indexer finishes.");
} catch (Exception e) {
- Log.Exception ("CollectionIndexer found on the Bus, but doesn't say Hello", e);
+ Log.Error ("CollectionIndexer found on the Bus, but doesn't say Hello", e);
}
} else if (ApplicationContext.CommandLine.Contains ("indexer")) {
// Indexer Client
@@ -122,7 +122,7 @@ namespace Booter
gdk_notify_startup_complete ();
}
} catch (Exception e) {
- Hyena.Log.Exception ("Problem with NotifyStartupComplete", e);
+ Log.Error ("Problem with NotifyStartupComplete", e);
}
}
diff --git a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
index 0447bf3..b4a8e18 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
@@ -477,7 +477,7 @@ namespace Banshee.Collection
property.SetValue (dest, property.GetValue (source, null), null);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
b/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
index 18ac959..b434005 100644
--- a/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
+++ b/src/Core/Banshee.Core/Banshee.IO/DirectoryScannerPipelineElement.cs
@@ -73,7 +73,7 @@ namespace Banshee.IO
is_directory = !is_regular_file && Banshee.IO.Directory.Exists (source);
if (Debug) Log.InformationFormat (" > item {0} is reg file? {1} is dir? {2}", source,
is_regular_file, is_directory);
} catch (Exception e) {
- if (Debug) Log.Exception ("Testing if path is file or dir", e);
+ if (Debug) Log.Error ("Testing if path is file or dir", e);
if (Debug) Log.InformationFormat (" > item {0} is reg file? {1} is dir? {2}", source,
is_regular_file, is_directory);
return;
}
@@ -101,11 +101,11 @@ namespace Banshee.IO
}
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
- } catch (System.ArgumentException) {
- // If there are illegal characters in path
+ } catch (ArgumentException ex) {
+ Log.Warning (String.Format ("There are illegal characters in the path '{0}'", source),
ex);
}
}
}
diff --git a/src/Core/Banshee.Core/Banshee.Kernel/Scheduler.cs
b/src/Core/Banshee.Core/Banshee.Kernel/Scheduler.cs
index 619e737..54fac42 100644
--- a/src/Core/Banshee.Core/Banshee.Kernel/Scheduler.cs
+++ b/src/Core/Banshee.Core/Banshee.Kernel/Scheduler.cs
@@ -233,7 +233,7 @@ namespace Banshee.Kernel
current_running_job.Run();
OnJobFinished(current_running_job);
} catch(Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
index 651fc29..cc41959 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/Shuffler.cs
@@ -110,7 +110,7 @@ namespace Banshee.Collection.Database
random_modes.Add (random_by);
node_map[tnode] = random_by;
} catch (Exception e) {
- Log.Exception (String.Format ("Failed to load RandomBy extension: {0}", args.Path),
e);
+ Log.Error (String.Format ("Failed to load RandomBy extension: {0}", args.Path), e);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
b/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
index 6c1e59f..7f5ddae 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Indexer/CollectionIndexer.cs
@@ -183,7 +183,7 @@ namespace Banshee.Collection.Indexer
success = true;
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
Hyena.Log.DebugTimerPrint (timer_id, "CollectionIndexer.SaveToXml: {0}");
diff --git a/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
b/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
index a9263bd..73eaa63 100644
--- a/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
@@ -66,7 +66,7 @@ namespace Banshee.Collection
if (manager.Debug) Log.InformationFormat ("ImportElement processing {0}", item);
manager.OnImportRequested (item);
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Hyena.Log.Error (e);
}
return null;
}
diff --git a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
index 9faaaba..1fd0b6e 100644
--- a/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs
@@ -229,7 +229,7 @@ namespace Banshee.Collection
}
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Hyena.Log.Error (e);
}
return null;
}
diff --git a/src/Core/Banshee.Services/Banshee.Configuration/DefaultApplicationHelper.cs
b/src/Core/Banshee.Services/Banshee.Configuration/DefaultApplicationHelper.cs
index 94ff0ce..a0d6142 100644
--- a/src/Core/Banshee.Services/Banshee.Configuration/DefaultApplicationHelper.cs
+++ b/src/Core/Banshee.Services/Banshee.Configuration/DefaultApplicationHelper.cs
@@ -61,7 +61,7 @@ namespace Banshee.Configuration
Log.DebugFormat ("Loaded Default Application Helper: {0}", helper.GetType
().FullName);
break;
} catch (Exception e) {
- Log.Exception ("Default Application Helper backend failed to load", e);
+ Log.Error ("Default Application Helper backend failed to load", e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
index e9bbbf5..a40f8f2 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs
@@ -95,7 +95,7 @@ namespace Banshee.Database
try {
OptimizeDatabase ();
} catch (Exception e) {
- Log.Exception ("Error determining if ANALYZE is necessary", e);
+ Log.Error ("Error determining if ANALYZE is necessary", e);
}
// Update cached sorting keys
diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
index 522f556..240ca2e 100644
--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
+++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
@@ -751,7 +751,7 @@ namespace Banshee.Database
connection.RemoveFunction<MigratePartialFunction> ();
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Hyena.Log.Error (e);
}
return true;
}
@@ -1315,7 +1315,7 @@ namespace Banshee.Database
SELECT * FROM PlaylistEntries
");
} catch (Exception e) {
- Log.Exception ("Must be a pre-0.13.2 banshee.db, attempting to migrate", e);
+ Log.Error ("Must be a pre-0.13.2 banshee.db, attempting to migrate", e);
try {
Execute(@"
INSERT INTO CorePlaylists (PlaylistID, Name)
@@ -1325,7 +1325,7 @@ namespace Banshee.Database
");
Log.Debug ("Success, was able to migrate older playlist information");
} catch (Exception e2) {
- Log.Exception ("Failed to migrate playlists", e2);
+ Log.Error ("Failed to migrate playlists", e2);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
index dc80482..7c820a6 100644
--- a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
@@ -79,7 +79,7 @@ namespace Banshee.Equalizer
try {
Load ();
} catch (Exception e) {
- Log.Exception ("Failed to load equalizer", e);
+ Log.Error ("Failed to load equalizer", e);
}
}
@@ -234,11 +234,11 @@ namespace Banshee.Equalizer
}
Log.Information ("Converted legacy XML equalizer presets to new JSON format");
} catch (Exception xe) {
- Log.Exception ("Could not load equalizers.xml", xe);
+ Log.Error ("Could not load equalizers.xml", xe);
}
}
} catch (Exception e) {
- Log.Exception ("Could not load equalizers.json", e);
+ Log.Error ("Could not load equalizers.json", e);
}
Log.DebugTimerPrint (timer, "Loaded equalizer presets: {0}");
@@ -325,7 +325,7 @@ namespace Banshee.Equalizer
}
Log.Debug ("EqualizerManager", "Saved equalizers to disk");
} catch (Exception e) {
- Log.Exception ("Unable to save equalizers", e);
+ Log.Error ("Unable to save equalizers", e);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
b/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
index 9574f58..9267e2c 100644
--- a/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
@@ -58,7 +58,7 @@ namespace Banshee.Hardware
Log.DebugFormat ("Loaded HardwareManager backend: {0}", node.Id);
break;
} catch (Exception e) {
- Log.Exception ("Hardware manager extension failed to load", e);
+ Log.Error ("Hardware manager extension failed to load", e);
}
}
@@ -218,7 +218,7 @@ namespace Banshee.Hardware
return new_device;
}
} catch (Exception e) {
- Log.Exception ("Exception casting device", e);
+ Log.Error ("Exception casting device", e);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
index acc5a2a..c136234 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
@@ -130,7 +130,7 @@ namespace Banshee.MediaEngine
SetNextTrackUri (track == null ? null : track.Uri,
track == null || track.HasAttribute (TrackMediaAttributes.VideoStream) || track is
UnknownTrackInfo);
} catch (Exception e) {
- Log.Exception ("Failed to pre-buffer next track", e);
+ Log.Error ("Failed to pre-buffer next track", e);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
index 084934b..258e61c 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
@@ -371,7 +371,7 @@ namespace Banshee.MediaEngine
try {
OpenCheck (track, play);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
Log.Error (Catalog.GetString ("Problem with Player Engine"), e.Message, true);
Close ();
ActiveEngine = default_engine;
@@ -921,7 +921,7 @@ namespace Banshee.MediaEngine
try {
node.Value.Handler (args);
} catch (Exception e) {
- Log.Exception (String.Format ("Error running PlayerEngine handler for {0}",
args.Event), e);
+ Log.Error (String.Format ("Error running PlayerEngine handler for {0}",
args.Event), e);
}
}
node = node.Next;
diff --git a/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
b/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
index 93fafea..60bf357 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
@@ -122,7 +122,7 @@ namespace Banshee.Metadata.FileSystem
Log.Debug ("Got cover art from track's folder", best_file);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
b/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
index 5e532b3..48e7f21 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata.LastFM/LastFMQueryJob.cs
@@ -126,7 +126,7 @@ namespace Banshee.Metadata.LastFM
AddTag (tag);
}
} catch (Exception e) {
- Log.Exception ("Cover art found on Lastfm, but downloading it failed. Probably server under
high load or dead link", e);
+ Log.Error ("Cover art found on Lastfm, but downloading it failed. Probably server under high
load or dead link", e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
b/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
index 8cd398e..cc53915 100644
--- a/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
+++ b/src/Core/Banshee.Services/Banshee.Metadata/MetadataServiceJob.cs
@@ -99,7 +99,7 @@ namespace Banshee.Metadata
} catch (System.Threading.ThreadAbortException) {
throw;
} catch(Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
@@ -201,7 +201,7 @@ namespace Banshee.Metadata
Banshee.IO.StreamAssist.Save (from_stream, Banshee.IO.File.OpenWrite (tmp_uri, true));
Banshee.IO.File.Move (tmp_uri, path_uri);
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
b/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
index d2878f8..fff1f88 100644
--- a/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
+++ b/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
@@ -58,7 +58,7 @@ namespace Banshee.Metrics
try {
banshee_metrics = new BansheeMetrics ();
} catch (Exception e) {
- Hyena.Log.Exception ("Failed to start collection of anonymous usage data", e);
+ Log.Error ("Failed to start collection of anonymous usage data", e);
banshee_metrics = null;
}
}
diff --git a/src/Core/Banshee.Services/Banshee.PlatformServices/ScreensaverManager.cs
b/src/Core/Banshee.Services/Banshee.PlatformServices/ScreensaverManager.cs
index 8a1afe2..0e25d1b 100644
--- a/src/Core/Banshee.Services/Banshee.PlatformServices/ScreensaverManager.cs
+++ b/src/Core/Banshee.Services/Banshee.PlatformServices/ScreensaverManager.cs
@@ -45,7 +45,7 @@ namespace Banshee.PlatformServices
Log.DebugFormat ("Loaded IScreensaverManager: {0}", manager.GetType ().FullName);
break;
} catch (Exception e) {
- Log.Exception ("IScreensaverManager extension failed to load", e);
+ Log.Error ("IScreensaverManager extension failed to load", e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
index fa5d2f9..ddadabd 100644
--- a/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
+++ b/src/Core/Banshee.Services/Banshee.Playlist/PlaylistFileUtil.cs
@@ -250,7 +250,7 @@ namespace Banshee.Playlist
}
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
}
@@ -282,7 +282,7 @@ namespace Banshee.Playlist
importer.Finished += CreatePlaylist;
importer.Enqueue (uris);
} catch (PlaylistImportCanceledException e) {
- Hyena.Log.Exception (e);
+ Log.Warning (e);
}
}
@@ -314,7 +314,7 @@ namespace Banshee.Playlist
playlist.Reload ();
playlist.NotifyUser ();
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs
b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs
index a5331bb..b64e315 100644
--- a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs
+++ b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusConnection.cs
@@ -115,7 +115,7 @@ namespace Banshee.ServiceStack
return true;
}
} catch (Exception e) {
- Log.Exception ("DBus support could not be started. Disabling for this session.", e);
+ Log.Error ("DBus support could not be started. Disabling for this session.", e);
enabled = false;
}
diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/DbIteratorJob.cs
b/src/Core/Banshee.Services/Banshee.ServiceStack/DbIteratorJob.cs
index e755ea6..7d8050f 100644
--- a/src/Core/Banshee.Services/Banshee.ServiceStack/DbIteratorJob.cs
+++ b/src/Core/Banshee.Services/Banshee.ServiceStack/DbIteratorJob.cs
@@ -119,7 +119,7 @@ namespace Banshee.ServiceStack
Cleanup ();
throw;
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
failure_count++;
if (failure_count > MAX_FAILURE_COUNT) {
Log.WarningFormat ("Too many consecutive errors for job '{0}', aborting", this.Title);
diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
b/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
index 5b54f69..db998d2 100644
--- a/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
+++ b/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
@@ -79,7 +79,7 @@ namespace Banshee.ServiceStack
try {
AddinManager.Registry.DisableAddin (a.AddinId);
} catch {}
- Log.Exception (a.Message, a.Exception);
+ Log.Error (a.Message, a.Exception);
};
if (ApplicationContext.Debugging) {
@@ -189,7 +189,7 @@ namespace Banshee.ServiceStack
Log.Warning (String.Format ("Service `{0}' not started: {1}", type.FullName,
e.InnerException != null ? e.InnerException.Message : e.Message));
- Log.Exception (e.InnerException ?? e);
+ Log.Error (e.InnerException ?? e);
}
return null;
@@ -221,7 +221,7 @@ namespace Banshee.ServiceStack
dispose_services.Push (service);
} catch (Exception e) {
- Log.Exception (e.InnerException ?? e);
+ Log.Error (e.InnerException ?? e);
Log.Warning (String.Format ("Extension `{0}' not started: {1}",
service == null ? node.Path : service.GetType ().FullName, e.Message));
}
@@ -282,7 +282,7 @@ namespace Banshee.ServiceStack
((IDelayedInitializeService)service).DelayedInitialize ();
}
} catch (Exception e) {
- Log.Exception (e.InnerException ?? e);
+ Log.Error (e.InnerException ?? e);
Log.Warning (String.Format ("Service `{0}' not initialized: {1}",
service.GetType ().FullName, e.Message));
}
@@ -297,7 +297,7 @@ namespace Banshee.ServiceStack
((IDisposable)service).Dispose ();
Log.DebugFormat ("Service disposed ({0})", service.ServiceName);
} catch (Exception e) {
- Log.Exception (String.Format ("Service disposal ({0}) threw an exception",
service.ServiceName), e);
+ Log.Error (String.Format ("Service disposal ({0}) threw an exception",
service.ServiceName), e);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
index 87f0b68..104bcc5 100644
--- a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
@@ -531,7 +531,7 @@ namespace Banshee.Sources
skip_deletion.Add (track);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
ErrorSource.AddMessage (e.Message, track.Uri.ToString ());
}
@@ -647,7 +647,7 @@ namespace Banshee.Sources
AddTrackAndIncrementCount (track);
} catch (Exception e) {
IncrementAddedTracks ();
- Log.Exception (e);
+ Log.Error (e);
ErrorSource.AddMessage (e.Message, track.Uri.ToString ());
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
index dabc750..b83ab1d 100644
--- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
@@ -134,7 +134,7 @@ namespace Banshee.Sources
}
Log.DebugFormat ("Extension source loaded: {0}", source.Name);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
} else if (args.Change == ExtensionChange.Remove && extension_sources.ContainsKey (node.Id))
{
Source source = extension_sources[node.Id];
diff --git a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
index 74aff59..73abd18 100644
--- a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
@@ -54,7 +54,7 @@ namespace Banshee.Streaming
try {
return OpenPlay (new SafeUri (uri));
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
return null;
}
}
@@ -166,7 +166,7 @@ namespace Banshee.Streaming
LoadStreamUris ();
} catch (Exception e) {
trying_to_play = false;
- Log.Exception (this.ToString (), e);
+ Log.Error (this.ToString (), e);
SavePlaybackError (StreamPlaybackError.Unknown);
OnParsingPlaylistFinished ();
ServiceManager.PlayerEngine.Close ();
@@ -307,10 +307,10 @@ namespace Banshee.Streaming
}
Log.DebugFormat ("Parsed {0} URIs out of {1}", stream_uris.Count, this);
} catch (System.Net.WebException e) {
- Hyena.Log.Exception (this.ToString (), e);
+ Log.Warning (this.ToString (), e);
SavePlaybackError (StreamPlaybackError.ResourceNotFound);
} catch (Exception e) {
- Hyena.Log.Exception (this.ToString (), e);
+ Log.Error (this.ToString (), e);
SavePlaybackError (StreamPlaybackError.Unknown);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs
b/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs
index f4299cd..44960da 100644
--- a/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs
+++ b/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs
@@ -175,7 +175,7 @@ namespace Banshee.Web
while (HandleRequest(client));
} catch (IOException) {
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
} finally {
clients.Remove (client);
client.Close ();
@@ -191,7 +191,7 @@ namespace Banshee.Web
if (e.SocketErrorCode == SocketError.AddressAlreadyInUse && this.EndPoint is IPEndPoint) {
Log.InformationFormat ("Unable to bind {0} to port {1}", name, (EndPoint as
IPEndPoint).Port);
} else {
- Log.Exception (e);
+ Log.Warning (e);
}
return false;
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
index d3da931..7db4af9 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
@@ -83,7 +83,7 @@ namespace Banshee.Collection.Gui
try {
MigrateCacheDir ();
} catch (Exception e) {
- Log.Exception ("Could not migrate album artwork cache directory", e);
+ Log.Error ("Could not migrate album artwork cache directory", e);
}
if (ApplicationContext.CommandLine.Contains ("fetch-artwork")) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
index 24ed18c..b3dc7bd 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs
@@ -91,7 +91,7 @@ namespace Banshee.Collection.Gui
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
};
@@ -104,7 +104,7 @@ namespace Banshee.Collection.Gui
NotifyUpdated (track);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
};
@@ -134,7 +134,7 @@ namespace Banshee.Collection.Gui
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
};
@@ -143,7 +143,7 @@ namespace Banshee.Collection.Gui
try {
SetCoverArt (GetTrack (), Encoding.UTF8.GetString (a.SelectionData.Data));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
};
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs
index 4f560ad..44b2e42 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/EditorTrackInfo.cs
@@ -63,7 +63,7 @@ namespace Banshee.Gui.TrackEditor
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
}
@@ -99,7 +99,7 @@ namespace Banshee.Gui.TrackEditor
return StreamTagger.ProcessUri (Uri);
} catch (Exception e) {
if (Uri.Scheme == "file") {
- Hyena.Log.Exception ("Cannot load TagLib file", e);
+ Log.Error ("Cannot load TagLib file", e);
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
index c606948..cbc5dc5 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
@@ -33,6 +33,7 @@ using Mono.Unix;
using Mono.Addins;
using Gtk;
+using Hyena;
using Hyena.Gui;
using Hyena.Widgets;
@@ -237,7 +238,7 @@ namespace Banshee.Gui.TrackEditor
page.Widget.Show ();
}
} catch (Exception e) {
- Hyena.Log.Exception ("Failed to initialize NotebookPage extension node. Ensure it
implements ITrackEditorPage.", e);
+ Log.Error ("Failed to initialize NotebookPage extension node. Ensure it implements
ITrackEditorPage.", e);
}
}
@@ -337,7 +338,7 @@ namespace Banshee.Gui.TrackEditor
ITrackEditorModifier mod = (ITrackEditorModifier)node.CreateInstance ();
mod.Modify (this);
} catch (Exception e) {
- Hyena.Log.Exception ("Failed to initialize TrackEditor/Modifier extension node. Ensure
it implements ITrackEditorModifier.", e);
+ Log.Error ("Failed to initialize TrackEditor/Modifier extension node. Ensure it
implements ITrackEditorModifier.", e);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs
index 3d01e95..fe7f07a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TaskStatusIcon.cs
@@ -70,7 +70,7 @@ namespace Banshee.Gui.Widgets
Load ();
TaskActive = false;
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
// Listen for jobs
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
index 51a8a0c..68ce02b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs
@@ -77,7 +77,7 @@ namespace Banshee.Gui
Gtk.AccelMap.Load (accel_map_file);
}
} catch (Exception e) {
- Hyena.Log.Exception ("Failed to load custom AccelMap", e);
+ Log.Error ("Failed to load custom AccelMap", e);
}
}
@@ -86,7 +86,7 @@ namespace Banshee.Gui
try {
Gtk.AccelMap.Save (accel_map_file);
} catch (Exception e) {
- Hyena.Log.Exception ("Failed to save custom AccelMap", e);
+ Log.Error ("Failed to save custom AccelMap", e);
}
base.Dispose (disposing);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
index 4e58f24..46d8fdb 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs
@@ -130,7 +130,7 @@ namespace Banshee.Gui
AddBookmark (bookmark);
}
} catch (Exception e) {
- Log.Exception ("Unable to Add New Bookmark", e);
+ Log.Error ("Unable to Add New Bookmark", e);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
index da37016..2f9d770 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GtkBaseClient.cs
@@ -146,7 +146,7 @@ namespace Banshee.Gui
try {
node.CreateInstance ();
} catch (Exception e) {
- Log.Exception ("PostInitializeGtk extension failed to run", e);
+ Log.Error ("PostInitializeGtk extension failed to run", e);
}
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
index db16677..15d6870 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
@@ -139,7 +139,7 @@ namespace Banshee.Gui
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
index 59b4f7e..f64abad 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
@@ -361,7 +361,7 @@ namespace Banshee.Gui
filter_selection.Clear (false);
filter_selection.SelectAll ();
} else {
- Log.Exception (new Exception ("Filter focused, but selection is not filter
selection!"));
+ Log.Error (new Exception ("Filter focused, but selection is not filter selection!"));
}
} else {
UpdateActions (true, true, disable_for_filter_actions);
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
index 27622a7..5803ea2 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
@@ -184,7 +184,7 @@ namespace Banshee.Dap.AppleDevice
try {
MediaDatabase = new GPod.ITDB (Device.Mountpoint);
} catch (Exception e) {
- Log.Exception ("iPod database could not be loaded, creating a new one", e);
+ Log.Error ("iPod database could not be loaded, creating a new one", e);
if (GPod.ITDB.InitIpod (Volume.MountPoint, null, Volume.Name)) {
// this may throw again. In the future we need to implement some kind of alert
// mechanism to let the user know that something more serious is wrong with their
@@ -224,7 +224,7 @@ namespace Banshee.Dap.AppleDevice
tracks_map.Add (track.TrackId, track);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -321,7 +321,7 @@ namespace Banshee.Dap.AppleDevice
MediaDatabase.MasterPlaylist.Name = name;
base.Rename (name);
} catch (Exception e) {
- Log.Exception ("Trying to change iPod name", e);
+ Log.Error ("Trying to change iPod name", e);
}
}
@@ -553,7 +553,7 @@ namespace Banshee.Dap.AppleDevice
sync_thread = null;
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -606,7 +606,7 @@ namespace Banshee.Dap.AppleDevice
track.Save (false);
tracks_map[track.TrackId] = track;
} catch (Exception e) {
- Log.Exception ("Cannot save track to the Apple device", e);
+ Log.Error ("Cannot save track to the Apple device", e);
}
}
if (total > 0) {
@@ -630,7 +630,7 @@ namespace Banshee.Dap.AppleDevice
track.CommitToIpod (MediaDatabase);
} catch (Exception e) {
- Log.Exception ("Cannot save track to iPod", e);
+ Log.Error ("Cannot save track to iPod", e);
}
}
}
@@ -658,7 +658,7 @@ namespace Banshee.Dap.AppleDevice
Log.Error ("The ipod track was null");
}
} catch (Exception e) {
- Log.Exception ("Cannot remove track from iPod", e);
+ Log.Error ("Cannot remove track from iPod", e);
}
}
@@ -674,7 +674,7 @@ namespace Banshee.Dap.AppleDevice
UpdateProgress (progressUpdater, message, total - invalid_tracks_in_device.Count, total);
DeleteTrack (invalid_tracks_in_device.Dequeue (), false);
} catch (Exception e) {
- Log.Exception ("Cannot remove invalid track from iPod", e);
+ Log.Error ("Cannot remove invalid track from iPod", e);
}
}
}
@@ -723,7 +723,7 @@ namespace Banshee.Dap.AppleDevice
Log.Information ("Wrote iPod database");
} catch (Exception e) {
- Log.Exception ("Failed to save iPod database", e);
+ Log.Error ("Failed to save iPod database", e);
}
}
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
index 77b908d..9340a02 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
@@ -122,7 +122,7 @@ namespace Banshee.Dap.AppleDevice
try {
Uri = new SafeUri (System.IO.Path.Combine (track.ITDB.Mountpoint, track.IpodPath.Replace
(":", System.IO.Path.DirectorySeparatorChar.ToString ()).Substring (1)));
} catch (Exception ex) {
- Log.Exception (ex);
+ Log.Error (ex);
Uri = null;
}
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
index acc0a3e..0ce5877 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
@@ -99,7 +99,7 @@ namespace Banshee.Dap.MassStorage
}
} catch (Exception e) {
- Log.Exception ("Error parsing " + IsAudioPlayerPath, e);
+ Log.Error ("Error parsing " + IsAudioPlayerPath, e);
}
}
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
index 16c17d5..f49a8cf 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
@@ -80,7 +80,7 @@ namespace Banshee.Dap.MassStorage
ms_device = null;
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
ms_device = null;
}
@@ -356,7 +356,7 @@ namespace Banshee.Dap.MassStorage
try {
Banshee.IO.File.Delete (new SafeUri (file_name));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -389,7 +389,7 @@ namespace Banshee.Dap.MassStorage
playlist_format.Save (stream, from);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
} finally {
stream.Close ();
}
@@ -683,7 +683,7 @@ namespace Banshee.Dap.MassStorage
SafeUri uri = new SafeUri (command.DeviceId);
return BaseDirectory.StartsWith (uri.LocalPath);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
return false;
}
diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
index 1d00c7a..3ef48ff 100644
--- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
@@ -86,7 +86,7 @@ namespace Banshee.Dap.Mtp
);
throw new InvalidDeviceException ();
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
//ShowGeneralExceptionDialog (e);
throw new InvalidDeviceException ();
}
@@ -145,7 +145,7 @@ namespace Banshee.Dap.Mtp
try {
AddDapProperty (Catalog.GetString ("Battery level"), String.Format ("{0:0%}",
mtp_device.BatteryLevel/100.0));
} catch (Exception e) {
- Log.Exception ("Unable to get battery level from MTP device", e);
+ Log.Error ("Unable to get battery level from MTP device", e);
}
}
@@ -210,7 +210,7 @@ namespace Banshee.Dap.Mtp
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
OnTracksAdded ();
}
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
index e372f87..f3417c2 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs
@@ -113,7 +113,7 @@ namespace Banshee.Dap.Gui
}
UpdateUsage ();
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
});
}
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs b/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
index 5e77796..8537dca 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs
@@ -159,9 +159,9 @@ namespace Banshee.Dap
return source;
} catch (InvalidDeviceException) {
} catch (InvalidCastException e) {
- Log.Exception ("Extension is not a DapSource as required", e);
+ Log.Warning ("Extension is not a DapSource as required", e);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -216,7 +216,7 @@ namespace Banshee.Dap
service.sources.Add (device.Uuid, source);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -242,7 +242,7 @@ namespace Banshee.Dap
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
});
}
@@ -276,7 +276,7 @@ namespace Banshee.Dap
try {
ServiceManager.SourceManager.RemoveSource (source);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
});
}
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs b/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
index 2f1cabc..337f8a5 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
@@ -314,7 +314,7 @@ namespace Banshee.Dap
sync.Sync ();
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -438,7 +438,7 @@ namespace Banshee.Dap
try {
AttemptToAddTrackToDevice ((DatabaseTrackInfo)track, outputUri);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
IncrementAddedTracks ();
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
b/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
index 069a7a1..226c0c0 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
+++ b/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
@@ -119,7 +119,7 @@ namespace Banshee.Dap
GenericName, e.Message), true);
});
- Log.Exception (e);
+ Log.Error (e);
}
});
return true;
diff --git a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs
b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs
index 71ea8b7..347d970 100644
--- a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs
+++ b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs
@@ -188,7 +188,7 @@ namespace Banshee.AmazonMp3
try {
import_manager.Enqueue (amz_downloader.LocalPath);
} catch (Exception e) {
- Log.Exception ("Trying to queue amz file", e);
+ Log.Error ("Trying to queue amz file", e);
}
break;
default:
diff --git a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs
b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs
index ed298b8..62f1fc0 100644
--- a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs
+++ b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs
@@ -77,7 +77,7 @@ namespace Banshee.AmazonMp3
new AmazonDownloadManager (path);
Log.Information ("Downloading Amazon MP3 purchase", path);
} catch (Exception e) {
- Log.Exception ("Invalid .amz file: " + path, e);
+ Log.Error ("Invalid .amz file: " + path, e);
Log.Error (Catalog.GetString ("Invalid Amazon MP3 downloader file"), path, true);
}
}
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
index 06f519b..95cc242 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs
@@ -146,7 +146,7 @@ namespace Banshee.Bpm
try {
detector = (IBpmDetector)node.CreateInstance (typeof (IBpmDetector));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
if (detector != null) {
diff --git a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
index 63d2367..a407857 100644
--- a/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
+++ b/src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs
@@ -144,7 +144,7 @@ namespace Banshee.CoverArt
save = false;
throw;
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
} finally {
if (save) {
bool have_cover_art = CoverArtSpec.CoverExists (track.ArtistName, track.AlbumTitle);
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
index e11d927..f042c8f 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
@@ -40,6 +40,7 @@ using System.Threading;
using System.Collections;
using Banshee.Web;
+using Hyena;
using DAAP = Daap;
@@ -60,7 +61,7 @@ namespace Banshee.Daap
try {
server.Bind (EndPoint);
} catch (System.Net.Sockets.SocketException e) {
- Hyena.Log.Exception (e);
+ Log.Warning (e);
return false;
}
}
@@ -168,7 +169,7 @@ namespace Banshee.Daap
return;
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
code = HttpStatusCode.BadRequest;
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs
b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs
index bdec3bf..d5f75d2 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs
@@ -175,7 +175,7 @@ namespace Banshee.Daap
proxy_server = new DaapProxyWebServer ();
proxy_server.Start ();
} catch (Exception e) {
- Log.Exception ("Failed to start DAAP client", e);
+ Log.Error ("Failed to start DAAP client", e);
}
var uia_service = ServiceManager.Get<InterfaceActionService> ();
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
index d3784df..24c9b28 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
@@ -119,7 +119,7 @@ namespace Banshee.Daap
ThreadAssist.ProxyToMain (delegate {
ShowErrorView (DaapErrorType.BrokenAuthentication);
});
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
is_activating = false;
@@ -279,7 +279,7 @@ namespace Banshee.Daap
UpdateIcon ();
OnUpdated ();
} catch (Exception e) {
- Hyena.Log.Exception ("Caught exception while loading daap share", e);
+ Log.Error ("Caught exception while loading daap share", e);
ThreadAssist.ProxyToMain (delegate {
HideStatus ();
ShowErrorView (DaapErrorType.UserDisconnect);
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ProblemModel.cs
b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ProblemModel.cs
index 75ae21f..02f48ad 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ProblemModel.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ProblemModel.cs
@@ -97,7 +97,7 @@ namespace Banshee.Fixup
try {
solver = (Solver) node.CreateInstance (typeof (Solver));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
continue;
}
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs
b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs
index de6966f..2a61b56 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs
@@ -140,7 +140,7 @@ namespace Banshee.InternetArchive
}
});
} catch (Exception e) {
- Hyena.Log.Exception ("Error loading IA item details", e);
+ Log.Error ("Error loading IA item details", e);
ThreadAssist.ProxyToMain (delegate {
var web_e = e as System.Net.WebException;
diff --git a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs
b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs
index 97502b5..12242ac 100644
--- a/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs
+++ b/src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs
@@ -145,7 +145,7 @@ namespace Banshee.InternetArchive
results = search.GetResults ();
total_results = results.TotalResults;
} catch (System.Net.WebException e) {
- Hyena.Log.Exception ("Error searching the Internet Archive", e);
+ Log.Error ("Error searching the Internet Archive", e);
results = null;
err = e;
}
@@ -164,7 +164,7 @@ namespace Banshee.InternetArchive
success = true;
} catch (Exception e) {
err = e;
- Hyena.Log.Exception ("Error searching the Internet Archive", e);
+ Log.Error ("Error searching the Internet Archive", e);
}
}
diff --git a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/XspfMigrator.cs
b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/XspfMigrator.cs
index eae7e8c..df8ac76 100644
--- a/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/XspfMigrator.cs
+++ b/src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/XspfMigrator.cs
@@ -68,7 +68,7 @@ namespace Banshee.InternetRadio
MigrateXspf (file);
}
} catch (Exception e) {
- Log.Exception ("Error loading Internet Radio Stations from system default", e);
+ Log.Error ("Error loading Internet Radio Stations from system default", e);
}
return true;
@@ -93,7 +93,7 @@ namespace Banshee.InternetRadio
MigrateXspf (file);
}
} catch (Exception e) {
- Log.Exception ("Error migrating Internet Radio Stations", e);
+ Log.Error ("Error migrating Internet Radio Stations", e);
}
return true;
@@ -109,11 +109,11 @@ namespace Banshee.InternetRadio
try {
MigrateXspfTrack (playlist, track);
} catch (Exception e) {
- Log.Exception ("Could not migrate XSPF track", e);
+ Log.Error ("Could not migrate XSPF track", e);
}
}
} catch (Exception e) {
- Log.Exception ("Could not migrate XSPF playlist", e);
+ Log.Error ("Could not migrate XSPF playlist", e);
}
}
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
index 11f77c1..74c0ba1 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
@@ -262,7 +262,7 @@ namespace Banshee.Lastfm.Recommendations
UpdateForArtist (artist, artist_data.SimilarArtists, artist_data.TopAlbums,
artist_data.TopTracks);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
index 8efc253..92cfdeb 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs
@@ -166,7 +166,7 @@ namespace Banshee.Lastfm
top_artists.SetList (user.GetTopArtists (TopType.Overall));
} catch (Exception e) {
lastfm.SetStatus ("Failed to get information from your Last.fm profile", true,
ConnectionState.InvalidAccount);
- Log.Exception (String.Format ("LastfmUserData query failed for {0}", username), e);
+ Log.Error (String.Format ("LastfmUserData query failed for {0}", username), e);
}
ShowAll ();
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
index c474564..d592f92 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher/LibraryWatcherService.cs
@@ -39,6 +39,8 @@ using Banshee.Library;
using Banshee.Gui;
using Banshee.I18n;
+using Hyena;
+
namespace Banshee.LibraryWatcher
{
public class LibraryWatcherService : IExtensionService, IDisposable, IDelayedInitializeService
@@ -147,7 +149,7 @@ namespace Banshee.LibraryWatcher
Hyena.Log.DebugFormat ("Started LibraryWatcher for {0} ({1})", library.Name,
dir);
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
index c630640..d5b38b1 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
@@ -478,7 +478,7 @@ namespace Banshee.Mpris
try {
handler (interface_name, changed_properties, invalidated_properties.ToArray ());
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
changed_properties.Clear ();
invalidated_properties.Clear ();
@@ -501,7 +501,7 @@ namespace Banshee.Mpris
try {
playlist_handler (BuildPlaylistFromSource (source));
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
}
}
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
index 7dbad55..4e98a10 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs
@@ -520,7 +520,7 @@ namespace Banshee.NotificationArea
current_nf.Show ();
} catch (Exception e) {
- Hyena.Log.Exception (Catalog.GetString ("Cannot show notification"), e);
+ Log.Error (Catalog.GetString ("Cannot show notification"), e);
}
}
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenAdapter.cs
b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenAdapter.cs
index cf638cd..56d2002 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenAdapter.cs
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/FullscreenAdapter.cs
@@ -54,7 +54,7 @@ namespace Banshee.NowPlaying
try {
adapter.Fullscreen (window, fullscreen);
} catch (Exception e) {
- Log.Exception ("IFullscreenAdapter extension failed, so disabling", e);
+ Log.Error ("IFullscreenAdapter extension failed, so disabling", e);
DisposeAdapter ();
}
@@ -71,7 +71,7 @@ namespace Banshee.NowPlaying
Log.DebugFormat ("Loaded IFullscreenAdapter: {0}", adapter.GetType ().FullName);
break;
} catch (Exception e) {
- Log.Exception ("IFullscreenAdapter extension failed to load", e);
+ Log.Error ("IFullscreenAdapter extension failed to load", e);
}
}
@@ -100,7 +100,7 @@ namespace Banshee.NowPlaying
adapter.SuggestUnfullscreen -= OnSuggestUnfullscreen;
adapter.Dispose ();
} catch (Exception e) {
- Log.Exception ("IFullscreenAdapter failed to dispose", e);
+ Log.Error ("IFullscreenAdapter failed to dispose", e);
}
adapter = null;
diff --git a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs
b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs
index 5fe1d3f..d081caa 100644
--- a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs
+++ b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs
@@ -192,7 +192,7 @@ namespace Banshee.OpticalDisc.AudioCd
}
} catch (Exception e) {
Log.Error (Catalog.GetString ("Could not import CD"), e.Message, true);
- Log.Exception (e);
+ Log.Error (e);
if (ripper != null) {
ripper.Dispose ();
@@ -213,7 +213,7 @@ namespace Banshee.OpticalDisc.AudioCd
AudioCdDuplicator.Duplicate (Model);
} catch (Exception e) {
Hyena.Log.Error (Catalog.GetString ("Could not duplicate audio CD"), e.Message, true);
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
}
diff --git a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscService.cs
b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscService.cs
index 663aec1..7878152 100644
--- a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscService.cs
+++ b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscService.cs
@@ -136,7 +136,7 @@ namespace Banshee.OpticalDisc
}
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
Log.DebugFormat ("Mapping disc ({0})", volume.Uuid);
diff --git a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs
b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs
index 9f2321b..4d7d804 100644
--- a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs
+++ b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs
@@ -179,7 +179,7 @@ namespace Banshee.OpticalDisc
OnUpdated ();
});
- Log.Exception (e);
+ Log.Error (e);
}
});
diff --git a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
index 96aed2d..69d96fb 100644
--- a/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
+++ b/src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs
@@ -156,7 +156,7 @@ namespace Banshee.PlayerMigration
LogError (SafeUri.UriToFilename (uri), e);
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
// something went wrong, skip entry
}
}
@@ -173,7 +173,7 @@ namespace Banshee.PlayerMigration
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
LogError (amarok_db_path, Catalog.GetString ("Importing from Amarok failed"));
} finally {
conn.Dispose ();
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
index c45a7d1..22fa6e4 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
@@ -230,7 +230,7 @@ namespace Banshee.Podcasting
try {
MigrateDownloadCache ();
} catch (Exception e) {
- Hyena.Log.Exception ("Couldn't migrate podcast download cache", e);
+ Log.Error ("Couldn't migrate podcast download cache", e);
}
source = new PodcastSource ();
@@ -378,7 +378,7 @@ namespace Banshee.Podcasting
ProcessFile (feed, title);
}
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
}
} else if (uri.Contains ("xml") || uri.Contains ("rss") || uri.Contains ("feed") ||
uri.StartsWith ("itpc") || uri.StartsWith ("pcast")) {
// Handle normal XML/RSS URLs
@@ -400,7 +400,7 @@ namespace Banshee.Podcasting
});
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
});
}
diff --git a/src/Hyena b/src/Hyena
index a23a19e..0c17305 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit a23a19e296ffaba1cedd21dbdb3877044ed19e37
+Subproject commit 0c17305e2bd98f6cd6408ee011661e3e41f3c8ea
diff --git a/src/Libraries/Lastfm/Lastfm/Account.cs b/src/Libraries/Lastfm/Lastfm/Account.cs
index 0e5533c..10f9c7f 100644
--- a/src/Libraries/Lastfm/Lastfm/Account.cs
+++ b/src/Libraries/Lastfm/Lastfm/Account.cs
@@ -112,7 +112,7 @@ namespace Lastfm
return StationError.None;
} catch (Exception e) {
- Log.Exception ("Error in Lastfm.Account.RequestAuthorization", e);
+ Log.Error ("Error in Lastfm.Account.RequestAuthorization", e);
return StationError.Unknown;
}
}
@@ -144,7 +144,7 @@ namespace Lastfm
return StationError.None;
} catch (Exception e) {
- Log.Exception ("Error in Lastfm.Account.FetchSessionKey", e);
+ Log.Error ("Error in Lastfm.Account.FetchSessionKey", e);
return StationError.Unknown;
}
}
diff --git a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
index 9b63d23..35b0803 100644
--- a/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
+++ b/src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs
@@ -291,7 +291,7 @@ namespace Lastfm
nb_tracks_scrobbled = (int)ar.AsyncState;
} catch (Exception e) {
- Log.Exception ("Failed to complete the scrobble request", e);
+ Log.Error ("Failed to complete the scrobble request", e);
state = State.Idle;
return;
}
@@ -300,7 +300,7 @@ namespace Lastfm
try {
response = current_scrobble_request.GetResponseObject ();
} catch (Exception e) {
- Log.Exception ("Failed to process the scrobble response", e);
+ Log.Error ("Failed to process the scrobble response", e);
state = State.Idle;
return;
}
@@ -424,7 +424,7 @@ namespace Lastfm
try {
current_now_playing_request.EndSend (ar);
} catch (Exception e) {
- Log.Exception ("Failed to complete the NowPlaying request", e);
+ Log.Error ("Failed to complete the NowPlaying request", e);
state = State.Idle;
current_now_playing_request = null;
return;
diff --git a/src/Libraries/Lastfm/Lastfm/RadioConnection.cs b/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
index d70fadf..5c9e29a 100644
--- a/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
+++ b/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
@@ -196,7 +196,7 @@ namespace Lastfm
this.station = station;
return StationError.None;
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
return StationError.Unknown;
}
}
diff --git a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
index 31efc8d..404ecf5 100644
--- a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
@@ -121,20 +121,20 @@ namespace Migo.Syndication
task = download_manager.CreateDownloadTask (enclosure.Url, enclosure);
//Console.WriteLine ("Task DL path: {0}", task.LocalPath);
task.Name = String.Format ("{0} - {1}", parentFeed.Title, enclosure.Item.Title);
-
+
//task.StatusChanged
task.Completed += OnDownloadTaskCompletedHandler;
-
+
// Race condition...
// Should only be added when the task is associated or
// it can be canceled before it is added to the progress manager.
-
+
// Add a pre-association dict and move tasks to the
// queued dict once they've been offically added.
-
+
queued_downloads.Add (enclosure, task);
} catch (Exception e) {
- Log.Exception ("Could not download podcast enclosure", e);
+ Log.Error ("Could not download podcast enclosure", e);
}
}
}
@@ -327,7 +327,7 @@ namespace Migo.Syndication
Path.GetFileName (task.LocalPath)
);
} catch (Exception e) {
- Log.Exception (e);
+ Log.Error (e);
enc.LastDownloadError = FeedDownloadError.DownloadFailed;
enc.DownloadStatus = FeedDownloadStatus.DownloadFailed;
enc.Save ();
diff --git a/src/Libraries/Migo/Migo.Syndication/Feed.cs b/src/Libraries/Migo/Migo.Syndication/Feed.cs
index 0c7f998..a7a8fa1 100644
--- a/src/Libraries/Migo/Migo.Syndication/Feed.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Feed.cs
@@ -408,7 +408,7 @@ namespace Migo.Syndication
return true;
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Hyena.Log.Error (e);
}
return false;
}
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedUpdateTask.cs
b/src/Libraries/Migo/Migo.Syndication/FeedUpdateTask.cs
index 8da31de..5306553 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedUpdateTask.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedUpdateTask.cs
@@ -134,7 +134,7 @@ namespace Migo.Syndication
}
EmitCompletionEvents (FeedDownloadError.DownloadFailed);
- Log.Exception (e);
+ Log.Error (e);
}
}
@@ -160,7 +160,7 @@ namespace Migo.Syndication
error = FeedDownloadError.None;
notify_on_save = feed.LastBuildDate > last_built_at;
} catch (FormatException e) {
- Log.Exception (e);
+ Log.Warning (e);
error = FeedDownloadError.InvalidFeedFormat;
}
} else {
diff --git a/src/Libraries/Migo/Migo.Syndication/RssParser.cs
b/src/Libraries/Migo/Migo.Syndication/RssParser.cs
index 9024120..7cc9147 100644
--- a/src/Libraries/Migo/Migo.Syndication/RssParser.cs
+++ b/src/Libraries/Migo/Migo.Syndication/RssParser.cs
@@ -75,7 +75,7 @@ namespace Migo.Syndication
}
if (!loaded) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
throw new FormatException ("Invalid XML document.");
}
}
@@ -119,7 +119,7 @@ namespace Migo.Syndication
return feed;
} catch (Exception e) {
- Hyena.Log.Exception ("Caught error parsing RSS channel", e);
+ Log.Error ("Caught error parsing RSS channel", e);
}
return null;
@@ -131,7 +131,7 @@ namespace Migo.Syndication
try {
nodes = doc.SelectNodes ("//item");
} catch (Exception e) {
- Hyena.Log.Exception ("Unable to get any RSS items", e);
+ Log.Error ("Unable to get any RSS items", e);
}
if (nodes != null) {
@@ -144,7 +144,7 @@ namespace Migo.Syndication
item.Feed = feed;
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
}
if (item != null) {
@@ -181,7 +181,7 @@ namespace Migo.Syndication
return item;
} catch (Exception e) {
- Hyena.Log.Exception ("Caught error parsing RSS item", e);
+ Log.Error ("Caught error parsing RSS item", e);
}
return null;
@@ -203,7 +203,7 @@ namespace Migo.Syndication
enclosure.Keywords = GetXmlNodeText (node, "itunes:keywords");
return enclosure;
} catch (Exception e) {
- Hyena.Log.Exception (String.Format ("Caught error parsing RSS enclosure in {0}", url), e);
+ Log.Error (String.Format ("Caught error parsing RSS enclosure in {0}", url), e);
}
return null;
@@ -250,7 +250,7 @@ namespace Migo.Syndication
return enclosure;
} catch (Exception e) {
- Hyena.Log.Exception ("Caught error parsing RSS media:content", e);
+ Log.Error ("Caught error parsing RSS media:content", e);
}
return null;
diff --git a/src/Libraries/Migo/Migo.TaskCore/AsyncCommandQueue/AsyncCommandQueue.cs
b/src/Libraries/Migo/Migo.TaskCore/AsyncCommandQueue/AsyncCommandQueue.cs
index 1346602..4ded2c6 100644
--- a/src/Libraries/Migo/Migo.TaskCore/AsyncCommandQueue/AsyncCommandQueue.cs
+++ b/src/Libraries/Migo/Migo.TaskCore/AsyncCommandQueue/AsyncCommandQueue.cs
@@ -30,6 +30,8 @@ using System;
using System.Threading;
using System.Collections.Generic;
+using Hyena;
+
namespace Migo.TaskCore
{
delegate void ExecuteCommand (ICommand command);
@@ -212,7 +214,7 @@ namespace Migo.TaskCore
try {
execCommand (e);
} catch (Exception ex) {
- Hyena.Log.Exception (ex);
+ Log.Error (ex);
}
}
@@ -244,7 +246,7 @@ namespace Migo.TaskCore
try {
handler (this, new EventArgs ());
} catch (Exception ex) {
- Hyena.Log.Exception (ex);
+ Log.Error (ex);
}
}
}
diff --git a/src/Libraries/Migo/Migo.TaskCore/TaskGroup.cs b/src/Libraries/Migo/Migo.TaskCore/TaskGroup.cs
index 3c587a7..48d57ed 100644
--- a/src/Libraries/Migo/Migo.TaskCore/TaskGroup.cs
+++ b/src/Libraries/Migo/Migo.TaskCore/TaskGroup.cs
@@ -33,6 +33,8 @@ using System.Collections.Generic;
using Migo.TaskCore.Collections;
+using Hyena;
+
namespace Migo.TaskCore
{
public class TaskGroup<T> where T : Task
@@ -352,7 +354,7 @@ namespace Migo.TaskCore
OnStarted ();
SpawnExecutionThread ();
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
SetExecuting (false);
Reset ();
OnStopped ();
@@ -808,7 +810,7 @@ namespace Migo.TaskCore
task.ExecuteAsync ();
}
} catch (Exception e) {
- Hyena.Log.Exception (e);
+ Log.Error (e);
try {
gsm.SuspendUpdate = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
