Revision 2f5fcd2f
| b/trunk/Pithos.Client.WPF/PithosAccount.cs | ||
|---|---|---|
| 45 | 45 |
|
| 46 | 46 |
using System.Reflection; |
| 47 | 47 |
using Pithos.Client.WPF.Preferences; |
| 48 |
using Pithos.Client.WPF.Properties; |
|
| 48 |
using Pithos.Client.WPF.Properties; |
|
| 49 |
using Pithos.Interfaces; |
|
| 49 | 50 |
using Pithos.Network; |
| 50 | 51 |
using log4net; |
| 51 | 52 |
|
| ... | ... | |
| 124 | 125 |
*/ |
| 125 | 126 |
} |
| 126 | 127 |
|
| 128 |
public static Uri GetLoginUri(string serverUrl) |
|
| 129 |
{
|
|
| 130 |
return GetLoginUri(new Uri(serverUrl)); |
|
| 131 |
} |
|
| 127 | 132 |
|
| 133 |
public static Uri GetLoginUri(Uri serverUri) |
|
| 134 |
{
|
|
| 135 |
var loginUri = serverUri.Combine("im/login");
|
|
| 136 |
} |
|
| 128 | 137 |
|
| 129 | 138 |
|
| 130 | 139 |
} |
| b/trunk/Pithos.Client.WPF/Preferences/AddAccountViewModel.cs | ||
|---|---|---|
| 253 | 253 |
|
| 254 | 254 |
try |
| 255 | 255 |
{
|
| 256 |
var loginUri=new Uri(CurrentServer).Combine("login");
|
|
| 256 |
var loginUri = PithosAccount.GetLoginUri(CurrentServer);
|
|
| 257 | 257 |
var credentials = PithosAccount.RetrieveCredentials(loginUri.ToString()); |
| 258 | 258 |
if (credentials == null) |
| 259 | 259 |
return; |
| b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs | ||
|---|---|---|
| 281 | 281 |
|
| 282 | 282 |
var name = CurrentAccount.AccountName; |
| 283 | 283 |
|
| 284 |
var loginUri = new Uri(CurrentAccount.ServerUrl).Combine("login");
|
|
| 284 |
var loginUri = PithosAccount.GetLoginUri(CurrentAccount.ServerUrl);
|
|
| 285 | 285 |
var credentials = PithosAccount.RetrieveCredentials(loginUri.ToString(), name); |
| 286 | 286 |
if (credentials == null) |
| 287 | 287 |
return; |
Also available in: Unified diff