beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/hbons/SparkleShare into enhancements

Browse source
This commit is contained in:
Travis Glenn Hansen 2011-11-03 18:21:48 -06:00
parent 04d13ef26b 25877948ad
commit 74fc03f354
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SparkleLib/SparkleListenerBase.cs
View file

@ -149,18 +149,17 @@ namespace SparkleLib {
}
public bool HasQueueDownAnnouncement (string folder_identifier)
public string NextQueueDownMessage (string folder_identifier)
{
this.queue_down = this.queue_down.Distinct ().ToList ();
foreach (SparkleAnnouncement announcement in this.queue_down.GetRange(0, this.queue_down.Count)) {
foreach (SparkleAnnouncement announcement in this.queue_down.GetRange (0, this.queue_down.Count)) {
if (announcement.FolderIdentifier.Equals (folder_identifier)) {
string message = announcement.Message;
this.queue_down.Remove (announcement);
return true;
return message;
}
}
return false;
return null;
}

10
SparkleLib/SparkleRepoBase.cs
View file

@ -256,14 +256,18 @@ namespace SparkleLib {
this.listener.Announcement += delegate (SparkleAnnouncement announcement) {
string identifier = Identifier;
if (announcement.FolderIdentifier == identifier &&
if (announcement.FolderIdentifier.Equals (identifier) &&
!announcement.Message.Equals (CurrentRevision)) {
if ((Status != SyncStatus.SyncUp) &&
(Status != SyncStatus.SyncDown) &&
!this.is_buffering) {
while (this.listener.HasQueueDownAnnouncement (identifier))
SyncDownBase ();
string message;
while ((message = this.listener.NextQueueDownMessage (identifier)) != null) {
if (!message.Equals (CurrentRevision))
SyncDownBase ();
}
}
}
};