github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 05:53:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default disabling Outlook export to meeting items, the bitmaps are changed to BMP by Outlook. Also removed some old obsolete code.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1668 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-02-20 13:39:58 +00:00
commit 7669f78de6
4 changed files with 20 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Greenshot/Destinations/EmailDestination.cs
View file

@ -74,7 +74,9 @@ namespace Greenshot.Destinations {
exePath = GetExePath("OUTLOOK.EXE");
if (exePath != null && File.Exists(exePath)) {
applicationIcon = GetExeIcon(exePath, 0);
meetingIcon = GetExeIcon(exePath, 2);
if (conf.OutlookAllowExportInMeetings) {
meetingIcon = GetExeIcon(exePath, 2);
}
} else {
exePath = null;
}
@ -148,6 +150,10 @@ namespace Greenshot.Destinations {
get {
if (isOutlookUsed && outlookInspectorCaption != null) {
if (OlObjectClass.olAppointment.Equals(outlookInspectorType)) {
// Make sure we loaded the icon, maybe the configuration has been changed!
if (meetingIcon == null) {
meetingIcon = GetExeIcon(exePath, 2);
}
return meetingIcon;
} else {
return mailIcon;