banshee r3811 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources src/Extensions/Banshee.Podcasting src/Extensions/Banshee.Podcasting/Banshee.Podcasting src/Libraries/Migo src/Libraries/Migo/Migo/Migo.Syndication src/Libraries/Migo/Migo/Migo.Syndication/Enumerations src/Libraries/Migo/Migo/Migo.Syndication/EventArgs src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss
- From: gburt svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3811 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources src/Extensions/Banshee.Podcasting src/Extensions/Banshee.Podcasting/Banshee.Podcasting src/Libraries/Migo src/Libraries/Migo/Migo/Migo.Syndication src/Libraries/Migo/Migo/Migo.Syndication/Enumerations src/Libraries/Migo/Migo/Migo.Syndication/EventArgs src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss
- Date: Wed, 23 Apr 2008 19:04:03 +0100 (BST)
Author: gburt
Date: Wed Apr 23 18:04:02 2008
New Revision: 3811
URL: http://svn.gnome.org/viewvc/banshee?rev=3811&view=rev
Log:
2008-04-23 Gabriel Burt <gabriel burt gmail com>
* src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs: Fix typo in
delete tracks user job message.
* src/Extensions/Banshee.Podcasting/*:
* src/Libraries/Migo/*: Fix assembly references in .mdp, and rename one
enum and its values to FDG standards.
Added:
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs (contents, props changed)
- copied, changed from r3810, /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs
Removed:
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp
trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs
trunk/banshee/src/Libraries/Migo/Makefile.am
trunk/banshee/src/Libraries/Migo/Migo.mdp
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/EventArgs/FeedDownloadCompletedEventArgs.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedUpdateTask.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedDataWrapper.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedEnclosureDataWrapper.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedEnclosureWrapper.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedWrapper.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedEnclosureWrapper.cs
trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedWrapper.cs
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs Wed Apr 23 18:04:02 2008
@@ -451,7 +451,7 @@
get {
lock (this) {
if (delete_track_job == null) {
- delete_track_job = new BatchUserJob (String.Format (Catalog.GetString ("Deleting {0} of {1} From {0}"), "{0}", "{1}", Name),
+ delete_track_job = new BatchUserJob (String.Format (Catalog.GetString ("Deleting {0} of {1} From {2}"), "{0}", "{1}", Name),
Properties.GetStringList ("Icon.Name"));
//delete_track_job.DelayShow = true;
delete_track_job.Register ();
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.mdp Wed Apr 23 18:04:02 2008
@@ -44,6 +44,9 @@
<ProjectReference type="Project" localcopy="True" refto="Banshee.Services" />
<ProjectReference type="Project" localcopy="True" refto="Banshee.ThickClient" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Project" localcopy="True" refto="Migo" />
+ <ProjectReference type="Project" localcopy="True" refto="Hyena" />
+ <ProjectReference type="Project" localcopy="True" refto="Hyena.Gui" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am">
<BuildFilesVar Sync="True" Name="SOURCES" />
Modified: trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastCore.cs Wed Apr 23 18:04:02 2008
@@ -391,7 +391,7 @@
lock (sync) {
PodcastFeed f = feedDict[e.Feed.LocalID];
- if (e.Error == FEEDS_DOWNLOAD_ERROR.FDE_NONE) {
+ if (e.Error == FeedDownloadError.None) {
if (String.IsNullOrEmpty(e.Feed.LocalEnclosurePath)) {
e.Feed.LocalEnclosurePath = Path.Combine (
tmpEnclosurePath, SanitizeName (e.Feed.Name)
Modified: trunk/banshee/src/Libraries/Migo/Makefile.am
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Makefile.am (original)
+++ trunk/banshee/src/Libraries/Migo/Makefile.am Wed Apr 23 18:04:02 2008
@@ -16,9 +16,9 @@
Migo/Migo.Net/EventArgs/TransferRateUpdatedEventArgs.cs \
Migo/Migo.Net/Exceptions/RemoteFileModifiedException.cs \
Migo/Migo.Net/TransferStatusManager.cs \
+ Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_ACTION.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_STATUS.cs \
- Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_DOWNLOAD_COUNT_FLAGS.cs \
Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_ITEM_COUNT_FLAGS.cs \
Modified: trunk/banshee/src/Libraries/Migo/Migo.mdp
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo.mdp (original)
+++ trunk/banshee/src/Libraries/Migo/Migo.mdp Wed Apr 23 18:04:02 2008
@@ -24,7 +24,7 @@
<File name="Migo/Migo.Net/TransferStatusManager.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_ACTION.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_BACKGROUNDSYNC_STATUS.cs" subtype="Code" buildaction="Compile" />
- <File name="Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs" subtype="Code" buildaction="Compile" />
+ <File name="Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_STATUS.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_DOWNLOAD_COUNT_FLAGS.cs" subtype="Code" buildaction="Compile" />
<File name="Migo/Migo.Syndication/Enumerations/FEEDS_EVENTS_ITEM_COUNT_FLAGS.cs" subtype="Code" buildaction="Compile" />
@@ -94,6 +94,7 @@
<References>
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Project" localcopy="True" refto="Hyena" />
</References>
<Deployment.LinuxDeployData generateScript="False" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
Copied: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs (from r3810, /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs)
==============================================================================
--- /trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FEEDS_DOWNLOAD_ERROR.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Enumerations/FeedDownloadError.cs Wed Apr 23 18:04:02 2008
@@ -28,20 +28,20 @@
namespace Migo.Syndication
{
- public enum FEEDS_DOWNLOAD_ERROR : int
+ public enum FeedDownloadError : int
{
- FDE_NONE = 0,
- FDE_DOWNLOAD_FAILED = 1,
- FDE_INVALID_FEED_FORMAT = 2,
- FDE_NORMALIZATION_FAILED = 3,
- FDE_PERSISTENCE_FAILED = 4,
- FDE_DOWNLOAD_BLOCKED = 5,
- FDE_CANCELED = 6,
- FDE_UNSUPPORTED_AUTH = 7,
- FDE_BACKGROUND_DOWNLOAD_DISABLED = 8,
- FDE_NOT_EXIST = 9,
- FDE_UNSUPPORTED_MSXML = 10,
- FDE_UNSUPPORTED_DTD = 11,
- FDE_DOWNLOAD_SIZE_LIMIT_EXCEEDED = 12
+ None = 0,
+ DownloadFailed = 1,
+ InvalidFeedFormat = 2,
+ NormalizationFailed = 3,
+ PersistenceFailed = 4,
+ DownloadBlocked = 5,
+ Canceled = 6,
+ UnsupportedAuth = 7,
+ BackgroundDownloadDisabled = 8,
+ DoesNotExist = 9,
+ UnsupportedMsXml = 10,
+ UnsupportedDtd = 11,
+ DownloadSizeLimitExceeded = 12
}
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/EventArgs/FeedDownloadCompletedEventArgs.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/EventArgs/FeedDownloadCompletedEventArgs.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/EventArgs/FeedDownloadCompletedEventArgs.cs Wed Apr 23 18:04:02 2008
@@ -32,18 +32,18 @@
{
public class FeedDownloadCompletedEventArgs : FeedEventArgs
{
- private readonly FEEDS_DOWNLOAD_ERROR error;
+ private readonly FeedDownloadError error;
- public FEEDS_DOWNLOAD_ERROR Error
+ public FeedDownloadError Error
{
get { return error; }
}
public FeedDownloadCompletedEventArgs (IFeed feed,
- FEEDS_DOWNLOAD_ERROR error) : base (feed)
+ FeedDownloadError error) : base (feed)
{
- if (error < FEEDS_DOWNLOAD_ERROR.FDE_NONE ||
- error > FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_SIZE_LIMIT_EXCEEDED) {
+ if (error < FeedDownloadError.None ||
+ error > FeedDownloadError.DownloadSizeLimitExceeded) {
throw new ArgumentException ("error: Value out of range");
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Feed.cs Wed Apr 23 18:04:02 2008
@@ -70,7 +70,7 @@
private Dictionary<long,FeedItem> itemsByID;
private string language;
private DateTime lastBuildDate;
- private FEEDS_DOWNLOAD_ERROR lastDownloadError;
+ private FeedDownloadError lastDownloadError;
private DateTime lastDownloadTime;
private DateTime lastWriteTime;
private string link;
@@ -197,7 +197,7 @@
get { lock (sync) { return lastBuildDate; } }
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError
+ public FeedDownloadError LastDownloadError
{
get { lock (sync) { return lastDownloadError; } }
}
@@ -613,7 +613,7 @@
lock (sync) {
ResetUpdating ();
OnFeedDownloadCompleted (
- FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_FAILED
+ FeedDownloadError.DownloadFailed
);
}
}
@@ -633,7 +633,7 @@
} else {
ret = true;
ResetUpdating ();
- OnFeedDownloadCompleted (FEEDS_DOWNLOAD_ERROR.FDE_CANCELED);
+ OnFeedDownloadCompleted (FeedDownloadError.Canceled);
}
}
}
@@ -1096,13 +1096,13 @@
private void OnDownloadStringCompleted (object sender,
Migo.Net.DownloadStringCompletedEventArgs e)
{
- FEEDS_DOWNLOAD_ERROR error = FEEDS_DOWNLOAD_ERROR.FDE_NONE;
+ FeedDownloadError error = FeedDownloadError.None;
try {
lock (sync) {
try {
if (e.Error != null) {
- error = FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_FAILED;
+ error = FeedDownloadError.DownloadFailed;
WebException we = e.Error as WebException;
@@ -1113,29 +1113,29 @@
switch (resp.StatusCode) {
case HttpStatusCode.NotFound:
case HttpStatusCode.Gone:
- error = FEEDS_DOWNLOAD_ERROR.FDE_NOT_EXIST;
+ error = FeedDownloadError.DoesNotExist;
break;
case HttpStatusCode.NotModified:
- error = FEEDS_DOWNLOAD_ERROR.FDE_NONE;
+ error = FeedDownloadError.None;
break;
case HttpStatusCode.Unauthorized:
- error = FEEDS_DOWNLOAD_ERROR.FDE_UNSUPPORTED_AUTH;
+ error = FeedDownloadError.UnsupportedAuth;
break;
default:
- error = FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_FAILED;
+ error = FeedDownloadError.DownloadFailed;
break;
}
}
}
} else if (canceled | deleted) {
- error = FEEDS_DOWNLOAD_ERROR.FDE_CANCELED;
+ error = FeedDownloadError.Canceled;
} else {
try {
IFeedWrapper wrapper = new RssFeedWrapper (Url, e.Result);
Update (wrapper, false);
} catch (FormatException) {
//Console.WriteLine ("FormatException: {0}", fe.Message);
- error = FEEDS_DOWNLOAD_ERROR.FDE_INVALID_FEED_FORMAT;
+ error = FeedDownloadError.InvalidFeedFormat;
}
}
} catch (Exception e2) {
@@ -1153,7 +1153,7 @@
try {
lastDownloadError = error;
- if (lastDownloadError == FEEDS_DOWNLOAD_ERROR.FDE_NONE) {
+ if (lastDownloadError == FeedDownloadError.None) {
downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED;
} else {
downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
@@ -1266,7 +1266,7 @@
}));
}
- private void OnFeedDownloadCompleted (FEEDS_DOWNLOAD_ERROR error)
+ private void OnFeedDownloadCompleted (FeedDownloadError error)
{
parent.RegisterCommand (new CommandWrapper (delegate {
EventHandler<FeedDownloadCompletedEventArgs> handler = FeedDownloadCompleted;
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedEnclosure.cs Wed Apr 23 18:04:02 2008
@@ -43,7 +43,7 @@
private FEEDS_DOWNLOAD_STATUS downloadStatus;
private string downloadUrl;
private bool active;
- private FEEDS_DOWNLOAD_ERROR lastDownloadError;
+ private FeedDownloadError lastDownloadError;
private long length;
private long localID;
private string localPath;
@@ -107,7 +107,7 @@
get { lock (sync) { return downloadUrl; } }
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError
+ public FeedDownloadError LastDownloadError
{
get {
lock (sync) {
@@ -280,7 +280,7 @@
//Console.WriteLine ("Status - SetCanceled: canceled: {0} - downloading: {1}", canceled, downloading);
if (!canceled && !stopped && downloading) {
ret = canceled = true;
- lastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_CANCELED;
+ lastDownloadError = FeedDownloadError.Canceled;
}
}
//Console.WriteLine ("Status - SetCanceled: ret: {0}", ret);
@@ -299,7 +299,7 @@
ret = downloading = true;
downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_PENDING;
- lastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_NONE;
+ lastDownloadError = FeedDownloadError.None;
}
}
@@ -313,7 +313,7 @@
lock (sync) {
if (!canceled && !stopped && downloading) {
ret = stopped = true;
- lastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_CANCELED;
+ lastDownloadError = FeedDownloadError.Canceled;
}
}
@@ -382,7 +382,7 @@
Directory.Delete (path);
} catch {}
} catch {
- lastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_FAILED;
+ lastDownloadError = FeedDownloadError.DownloadFailed;
downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
throw;
}
@@ -393,7 +393,7 @@
this.downloadMimeType = mimeType;
downloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOADED;
- lastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_NONE;
+ lastDownloadError = FeedDownloadError.None;
Commit ();
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedUpdateTask.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedUpdateTask.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedUpdateTask.cs Wed Apr 23 18:04:02 2008
@@ -76,7 +76,7 @@
lock (SyncRoot) {
if (!feed.CancelAsyncDownload () && !IsCompleted) {
//Console.WriteLine ("CancelAsync - FeedUpdateTask - 001");
- EmitCompletionEvents (FEEDS_DOWNLOAD_ERROR.FDE_CANCELED);
+ EmitCompletionEvents (FeedDownloadError.Canceled);
}
}
//Console.WriteLine ("CancelAsync - FeedUpdateTask - 002");
@@ -117,15 +117,15 @@
}
}
- private void EmitCompletionEvents (FEEDS_DOWNLOAD_ERROR err)
+ private void EmitCompletionEvents (FeedDownloadError err)
{
feed.FeedDownloadCompleted -= OnFeedDownloadCompletedHandler;
switch (err) {
- case FEEDS_DOWNLOAD_ERROR.FDE_NONE:
+ case FeedDownloadError.None:
SetStatus (TaskStatus.Succeeded);
break;
- case FEEDS_DOWNLOAD_ERROR.FDE_CANCELED:
+ case FeedDownloadError.Canceled:
SetStatus (TaskStatus.Cancelled);
break;
default:
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/FeedsManager.cs Wed Apr 23 18:04:02 2008
@@ -749,7 +749,7 @@
Path.GetFileName (task.LocalPath)
);
} catch {
- enc.LastDownloadError = FEEDS_DOWNLOAD_ERROR.FDE_DOWNLOAD_FAILED;
+ enc.LastDownloadError = FeedDownloadError.DownloadFailed;
enc.DownloadStatus = FEEDS_DOWNLOAD_STATUS.FDS_DOWNLOAD_FAILED;
}
}
@@ -932,7 +932,7 @@
}
}
- internal void OnFeedDownloadCompleted (Feed feed, FEEDS_DOWNLOAD_ERROR error)
+ internal void OnFeedDownloadCompleted (Feed feed, FeedDownloadError error)
{
if (feed == null) {
throw new ArgumentNullException ("feed");
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeed.cs Wed Apr 23 18:04:02 2008
@@ -63,7 +63,7 @@
ReadOnlyCollection<IFeedItem> Items { get; }
string Language { get; }
DateTime LastBuildDate { get; }
- FEEDS_DOWNLOAD_ERROR LastDownloadError { get; }
+ FeedDownloadError LastDownloadError { get; }
DateTime LastDownloadTime { get; }
DateTime LastWriteTime { get; }
string Link { get; }
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/IFeedEnclosure.cs Wed Apr 23 18:04:02 2008
@@ -35,7 +35,7 @@
string DownloadMimeType { get; }
FEEDS_DOWNLOAD_STATUS DownloadStatus { get; }
string DownloadUrl { get; }
- FEEDS_DOWNLOAD_ERROR LastDownloadError { get; }
+ FeedDownloadError LastDownloadError { get; }
long Length { get; }
long LocalID { get; }
string LocalPath { get; }
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedDataWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedDataWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedDataWrapper.cs Wed Apr 23 18:04:02 2008
@@ -116,16 +116,16 @@
get { return GetDateTimeSafe ((int)FeedPropertyID.LastBuildDate); }
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError
+ public FeedDownloadError LastDownloadError
{
get {
int dbVal = GetInt32Safe ((int)FeedPropertyID.LastDownloadError);
- if (!Enum.IsDefined (typeof (FEEDS_DOWNLOAD_ERROR), dbVal)) {
+ if (!Enum.IsDefined (typeof (FeedDownloadError), dbVal)) {
dbVal = 0;
}
- return (FEEDS_DOWNLOAD_ERROR) dbVal;
+ return (FeedDownloadError) dbVal;
}
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedEnclosureDataWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedEnclosureDataWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Db/FeedEnclosureDataWrapper.cs Wed Apr 23 18:04:02 2008
@@ -76,9 +76,9 @@
}
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError {
+ public FeedDownloadError LastDownloadError {
get {
- return (FEEDS_DOWNLOAD_ERROR) GetInt64Safe (
+ return (FeedDownloadError) GetInt64Safe (
(int) FeedEnclosurePropertyID.LastDownloadError
);
}
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedEnclosureWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedEnclosureWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedEnclosureWrapper.cs Wed Apr 23 18:04:02 2008
@@ -35,7 +35,7 @@
bool Active { get; }
string DownloadMimeType { get; }
string DownloadUrl { get; }
- FEEDS_DOWNLOAD_ERROR LastDownloadError { get; }
+ FeedDownloadError LastDownloadError { get; }
long Length { get; }
long LocalID { get; }
string LocalPath { get; }
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/IFeedWrapper.cs Wed Apr 23 18:04:02 2008
@@ -43,7 +43,7 @@
IEnumerable<IFeedItemWrapper> Items { get; }
string Language { get; }
DateTime LastBuildDate { get; }
- FEEDS_DOWNLOAD_ERROR LastDownloadError { get; }
+ FeedDownloadError LastDownloadError { get; }
DateTime LastDownloadTime { get; }
DateTime LastWriteTime { get; }
string Link { get; }
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedEnclosureWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedEnclosureWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedEnclosureWrapper.cs Wed Apr 23 18:04:02 2008
@@ -52,8 +52,8 @@
get { return String.Empty; }
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError {
- get { return FEEDS_DOWNLOAD_ERROR.FDE_NONE; }
+ public FeedDownloadError LastDownloadError {
+ get { return FeedDownloadError.None; }
}
public long Length
Modified: trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedWrapper.cs
==============================================================================
--- trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedWrapper.cs (original)
+++ trunk/banshee/src/Libraries/Migo/Migo/Migo.Syndication/Migo.Syndication.Data/Wrappers/Rss/RssFeedWrapper.cs Wed Apr 23 18:04:02 2008
@@ -163,9 +163,9 @@
get { return DateTime.Now.ToUniversalTime (); }
}
- public FEEDS_DOWNLOAD_ERROR LastDownloadError
+ public FeedDownloadError LastDownloadError
{
- get { return FEEDS_DOWNLOAD_ERROR.FDE_NONE; }
+ get { return FeedDownloadError.None; }
}
public bool DownloadEnclosuresAutomatically
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
