frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into release_1_4

Browse Source
This commit is contained in:
Patrick Simpson 2017-06-15 13:11:11 +02:00
commit d5f60f0f35
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Features/DebugSupport/DebugInfo.cs
View File

@ -90,7 +90,7 @@ namespace Acacia.Features.DebugSupport
// Add accounts
foreach (ZPushAccount account in ThisAddIn.Instance.Watcher.Accounts.GetAccounts())
{
PropertyDescriptor p = new CustomPropertyDescriptor<ZPushAccount, DebugInfo>(account.DisplayName, DebugCategory.Accounts, account);
PropertyDescriptor p = new CustomPropertyDescriptor<ZPushAccount, DebugInfo>(account.Account.DisplayName, DebugCategory.Accounts, account);
properties.Add(p);
}

2
src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
View File

@ -46,7 +46,7 @@ namespace Acacia.ZPush
[Browsable(false)]
public IAccount Account { get { return _account; } }
public string DisplayName { get { return _account.DisplayName; } }
public string DisplayName { get { return _account.SmtpAddress; } }
public string DeviceId { get { return _account.DeviceId; } }
[Browsable(false)]