From 23821bd23b21cdb88e0820134753ddc5572d661d Mon Sep 17 00:00:00 2001
From: Panagiotis Kanavos <pkanavos@gmail.com>
Date: Tue, 20 Dec 2011 18:21:05 +0200
Subject: [PATCH] Modified icon Fixed account SiteUri

---
 trunk/Pithos.Client.WPF/Images/Pithos.ico       |  Bin 1150 -> 5430 bytes
 trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs |   15 ++++-----------
 trunk/Pithos.Core/PithosMonitor.cs              |    3 ++-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/trunk/Pithos.Client.WPF/Images/Pithos.ico b/trunk/Pithos.Client.WPF/Images/Pithos.ico
index 3ee05b00608a59c874759de8a570ce404c278309..823f2ed65e5fa69684b57b698a47e13adf539483 100644
GIT binary patch
literal 5430
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

delta 194
zcmdm{^^Ze`fq@YS1q2wtAcKX0K@7;!0Ai4k0uVETNg#t|qN5h`tPN)-3kr%d&s@HB
zqND0$Kfw*mjng(xW)!kyo;tN>v#pRTBlFXH7bmw0r!qgjb8e!e;$%J%3Fg1|mP~Y%
zWnQ-B$Yf6uRpuotR!lAwX|w;&!0?Zsf#E-p{=p7me_&)_cmTv88YKRK8AAU7szX)_
Gk^=xj2ss=8

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
index 4a9881c..b5d6a5e 100644
--- a/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
+++ b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
@@ -131,14 +131,7 @@ namespace Pithos.Client.WPF {
         private async Task StartMonitoring()
         {
             try
-            {
-                if (Settings.Accounts == null)
-                {
-                    Settings.Accounts=new AccountsCollection();
-                    Settings.Save();
-                    return;
-                }
-                  
+            {                  
                 foreach (var account in Settings.Accounts)
                 {
                     await MonitorAccount(account);
@@ -340,10 +333,10 @@ namespace Pithos.Client.WPF {
 
         public void GoToSite(AccountInfo account)
         {
-            var site = String.Format("{0}/ui/?token={1}&user={2}",
+            /*var site = String.Format("{0}/ui/?token={1}&user={2}",
                 account.SiteUri,account.Token,
-                account.UserName);
-            Process.Start(site);
+                account.UserName);*/
+            Process.Start(account.SiteUri);
         }
 
         public void ShowFileProperties()
diff --git a/trunk/Pithos.Core/PithosMonitor.cs b/trunk/Pithos.Core/PithosMonitor.cs
index 874f580..d0a302e 100644
--- a/trunk/Pithos.Core/PithosMonitor.cs
+++ b/trunk/Pithos.Core/PithosMonitor.cs
@@ -136,7 +136,8 @@ namespace Pithos.Core
             CloudClient.UsePithos = true;
             CloudClient.AuthenticationUrl = this.AuthenticationUrl;            
 
-            _accountInfo = CloudClient.Authenticate();
+            _accountInfo = CloudClient.Authenticate();            
+            _accountInfo.SiteUri = AuthenticationUrl;
             _accountInfo.AccountPath = RootPath;
 
 
-- 
1.7.10.4