[banshee/stable-1.8] build: Fix compilation under Mono 2.8
- From: Alexander Kojevnikov <alexk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/stable-1.8] build: Fix compilation under Mono 2.8
- Date: Mon, 18 Oct 2010 23:28:10 +0000 (UTC)
commit 6fa11fedfcb9ee18e15c0a00aa4dbaea6b01aa77
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date: Tue Oct 19 10:28:01 2010 +1100
build: Fix compilation under Mono 2.8
.../Banshee.Gui.Dialogs/BansheeDialog.cs | 4 ++--
src/Hyena | 2 +-
src/Libraries/Migo/Migo.Net/AsyncWebClient.cs | 1 -
.../Migo/Migo.Syndication/EnclosureManager.cs | 19 -------------------
src/Libraries/Migo/Migo.Syndication/FeedItem.cs | 4 ----
5 files changed, 3 insertions(+), 27 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
index 9758cc6..d21d74e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/BansheeDialog.cs
@@ -117,7 +117,7 @@ namespace Banshee.Gui.Dialogs
return AddStockButton (stock, response, false);
}
- public new Button AddButton (string message, ResponseType response, bool isDefault)
+ public Button AddButton (string message, ResponseType response, bool isDefault)
{
return AddButton (message, response, isDefault, false);
}
@@ -127,7 +127,7 @@ namespace Banshee.Gui.Dialogs
return AddButton (stock, response, isDefault, true);
}
- public new Button AddButton (string message, ResponseType response, bool isDefault, bool isStock)
+ public Button AddButton (string message, ResponseType response, bool isDefault, bool isStock)
{
Button button = new Button (message);
button.CanDefault = true;
diff --git a/src/Hyena b/src/Hyena
index 8da3085..eb31a64 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit 8da3085bee4a5e6f395bf3f6bc51814691fd7806
+Subproject commit eb31a6406216da5b660430625fd9163b82d6fe14
diff --git a/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs b/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs
index d41e3ee..18ac5ff 100644
--- a/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs
+++ b/src/Libraries/Migo/Migo.Net/AsyncWebClient.cs
@@ -88,7 +88,6 @@ namespace Migo.Net
public event EventHandler<EventArgs> ResponseReceived;
public event EventHandler<DownloadProgressChangedEventArgs> DownloadProgressChanged;
- public event EventHandler<TransferRateUpdatedEventArgs> TransferRateUpdated;
public event EventHandler<AsyncCompletedEventArgs> DownloadFileCompleted;
public event EventHandler<DownloadDataCompletedEventArgs> DownloadDataCompleted;
diff --git a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
index 0e44b1f..520ad41 100644
--- a/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/EnclosureManager.cs
@@ -51,8 +51,6 @@ namespace Migo.Syndication
private readonly object sync = new object ();
private ManualResetEvent download_handle;
- public event EventHandler<TaskEventArgs<HttpFileDownloadTask>> EnclosureDownloadCompleted;
-
public EnclosureManager (DownloadManager downloadManager)
{
download_manager = downloadManager;
@@ -334,23 +332,6 @@ namespace Migo.Syndication
}
}
}
-
- OnEnclosureDownloadCompleted (task);
- }
-
- private void OnEnclosureDownloadCompleted (HttpFileDownloadTask task)
- {
- /*EventHandler<TaskEventArgs<HttpFileDownloadTask>> handler = EnclosureDownloadCompleted;
-
- if (handler != null) {
- AsyncCommandQueue<ICommand> cmdQCpy = command_queue;
-
- if (cmdQCpy != null) {
- cmdQCpy.Register (new EventWrapper<TaskEventArgs<HttpFileDownloadTask>> (
- handler, this, new TaskEventArgs<HttpFileDownloadTask> (task))
- );
- }
- } */
}
private void DownloadTaskRemoved (FeedEnclosure enc, HttpFileDownloadTask task, bool decQueuedCount)
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
index 0f479ee..b56012a 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
@@ -77,10 +77,6 @@ namespace Migo.Syndication
private DateTime pubDate;
private string title;
- public event Action<FeedItem> ItemAdded;
- public event Action<FeedItem> ItemChanged;
- public event Action<FeedItem> ItemRemoved;
-
#region Database-backed Properties
[DatabaseColumn ("ItemID", Constraints = DatabaseColumnConstraints.PrimaryKey)]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]