Changed the EmailDestination to work if Outlook is installed as MAPI client but the Outlook plugin is not installed. Also made some progress on the MAPI Recipient properties, but this still doesn't work.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2486 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-02-14 06:43:40 +00:00
commit 8980a505b1
2 changed files with 26 additions and 11 deletions

View file

@ -49,9 +49,8 @@ namespace Greenshot.Destinations {
isActiveFlag = true;
mapiClient = EmailConfigHelper.GetMapiClient();
if (!string.IsNullOrEmpty(mapiClient)) {
if (mapiClient.ToLower().Contains("microsoft outlook")) {
isActiveFlag = false;
}
// Active as we have a mapi client, can be disabled later
isActiveFlag = true;
}
}
}
@ -84,6 +83,15 @@ namespace Greenshot.Destinations {
public override bool isActive {
get {
if (isActiveFlag) {
// Disable if the office plugin is installed and the client is outlook
Type outlookdestination = Type.GetType("GreenshotOfficePlugin.OutlookDestination,GreenshotOfficePlugin");
if (outlookdestination != null) {
if (mapiClient.ToLower().Contains("microsoft outlook")) {
isActiveFlag = false;
}
}
}
return base.isActive && isActiveFlag;
}
}