Revision c875d683 trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs

b/trunk/Pithos.Client.WPF/FileProperties/ConflictResolver.cs
4 4 
using System.IO;
5 5 
using System.Linq;
6 6 
using System.Text;
7 
using System.Threading;
7 8 
using System.Windows;
8 9 
using Caliburn.Micro;
9 10 
using Pithos.Core;
......
116 117 
                          let account = accounts.First(acc => conflict.FilePath.StartsWith(acc.AccountPath, StringComparison.InvariantCultureIgnoreCase))
117 118 
                          let info = FileInfoExtensions.FromPath(conflict.FilePath)
118 119 
                          select new CloudUploadAction(account, info, conflict.State,
119 
                              account.BlockSize, account.BlockHash,"Resolver",false,new Progress<double>());
120 
                              account.BlockSize, account.BlockHash,"Resolver",false,CancellationToken.None, new Progress<double>());
120 121 

  		





  121
  122
  
    
            foreach (var action in actions)


  		





  122
  123
  
    
            {


  		












Also available in:
  Unified diff