diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index 79b2f4666..ee50aa76a 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -1,5 +1,5 @@  - + {CD642BF4-D815-4D67-A0B5-C69F0B8231AF} @@ -18,7 +18,8 @@ 3.5 - + + diff --git a/Greenshot/Helpers/PluginHelper.cs b/Greenshot/Helpers/PluginHelper.cs index 75a300bbf..9062490e3 100644 --- a/Greenshot/Helpers/PluginHelper.cs +++ b/Greenshot/Helpers/PluginHelper.cs @@ -213,7 +213,7 @@ namespace Greenshot.Helpers { /// /// /// - private void findPluginsOnPath(List pluginFiles, String path) { + private void findPluginsOnPath(List pluginFiles, string path) { if (Directory.Exists(path)) { try { foreach (string pluginFile in Directory.GetFiles(path, "*.gsp", SearchOption.AllDirectories)) { diff --git a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj index 57a002359..7bc39f15a 100644 --- a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj +++ b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj @@ -1,5 +1,5 @@  - + {697CF066-9077-4F22-99D9-D989CCE7282B} @@ -14,6 +14,11 @@ false Always + + + + + 3.5 diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj index a0722875c..b0535116e 100644 --- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj +++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj @@ -1,8 +1,8 @@  - + - 1685 + 1685 {C3052651-598A-44E2-AAB3-2E41311D50F9} Library GreenshotConfluencePlugin @@ -15,6 +15,11 @@ false OnBuildSuccess Client + + + + + 3.5 diff --git a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj index a9f9a0092..58f8f231e 100644 --- a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj +++ b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj @@ -1,5 +1,5 @@  - + {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12} @@ -14,6 +14,11 @@ false Always + + + + + 3.5 diff --git a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj index ca0f6b424..2f534d1b4 100644 --- a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj +++ b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj @@ -1,5 +1,5 @@  - + {47F23C86-604E-4CC3-8767-B3D4088F30BB} @@ -14,6 +14,11 @@ false OnBuildSuccess + + + + + 3.5 diff --git a/GreenshotFlickrPlugin/FlickrPlugin.cs b/GreenshotFlickrPlugin/FlickrPlugin.cs index 6e3285afb..ba6210b6e 100644 --- a/GreenshotFlickrPlugin/FlickrPlugin.cs +++ b/GreenshotFlickrPlugin/FlickrPlugin.cs @@ -125,7 +125,7 @@ namespace GreenshotFlickrPlugin _config.ShowConfigDialog(); } - public bool Upload(ICaptureDetails captureDetails, ISurface surface, out String uploadUrl) { + public bool Upload(ICaptureDetails captureDetails, ISurface surface, out string uploadUrl) { SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(_config.UploadFormat, _config.UploadJpegQuality, false); uploadUrl = null; try { diff --git a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj index 50ee51535..5c3c047e0 100644 --- a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj +++ b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj @@ -1,5 +1,5 @@  - + {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E} @@ -15,6 +15,10 @@ Always 3.5 + + + + diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj index 8cdaff142..6dea91f73 100644 --- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj +++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj @@ -1,5 +1,5 @@  - + {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50} @@ -17,7 +17,8 @@ 3.5 - + + diff --git a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj index f844ceb09..671d710a9 100644 --- a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj +++ b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj @@ -1,5 +1,5 @@  - + {19FEEF09-313F-43C7-819D-F1BCA782B08B} @@ -17,7 +17,8 @@ 3.5 - + + @@ -37,7 +38,9 @@ JiraForm.cs - + + Form + Form diff --git a/GreenshotOCRCommand/GreenshotOCRCommand.csproj b/GreenshotOCRCommand/GreenshotOCRCommand.csproj index 49089a7fb..94b553e26 100644 --- a/GreenshotOCRCommand/GreenshotOCRCommand.csproj +++ b/GreenshotOCRCommand/GreenshotOCRCommand.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -20,6 +20,11 @@ Off 4194304 x86 + + + + + 3.5 full diff --git a/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj b/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj index 7d0c78be1..56cbb92ca 100644 --- a/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj +++ b/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj @@ -1,5 +1,5 @@  - + {C6988EE8-2FEE-4349-9F09-F9628A0D8965} @@ -17,7 +17,8 @@ 3.5 - + + diff --git a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj index 7709d4fb3..07bf79ccf 100644 --- a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj +++ b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj @@ -1,5 +1,5 @@  - + {92599C09-FF29-4ABD-B6E6-C48ECD781BAB} Debug @@ -15,6 +15,11 @@ 4 false + + + + + 3.5 x86 diff --git a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj index aaa61dcd4..2a5bfe70e 100644 --- a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj +++ b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj @@ -1,5 +1,5 @@  - + {9C0ECC4C-7807-4111-916A-4F57BB29788A} @@ -14,6 +14,11 @@ false OnBuildSuccess + + + + + 3.5 diff --git a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj index 67beb0e1b..926f22050 100644 --- a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj +++ b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj @@ -1,5 +1,5 @@  - + {1893A2E4-A78A-4713-A8E7-E70058DABEE0} @@ -13,9 +13,12 @@ 4 false Always - + + 3.5 + + diff --git a/GreenshotPlugin/Core/NetworkHelper.cs b/GreenshotPlugin/Core/NetworkHelper.cs index 429265834..82937517d 100644 --- a/GreenshotPlugin/Core/NetworkHelper.cs +++ b/GreenshotPlugin/Core/NetworkHelper.cs @@ -471,14 +471,20 @@ namespace GreenshotPlugin.Core { isHttpError = (int)response.StatusCode >= 300; if (isHttpError) { - LOG.ErrorFormat("HTTP error {0} with content: {1}", response.StatusCode, responseData); + LOG.ErrorFormat("HTTP error {0}", response.StatusCode); } DebugHeaders(response); responseData = GetResponseAsString(response); - } catch (WebException e) { + if (isHttpError) + { + LOG.ErrorFormat("HTTP response {0}", responseData); + } + } + catch (WebException e) { response = (HttpWebResponse) e.Response; + HttpStatusCode statusCode = response.StatusCode; if (response != null) { - LOG.ErrorFormat("HTTP error {0}", response.StatusCode); + LOG.ErrorFormat("HTTP error {0}", statusCode); string errorContent = GetResponseAsString(response); if (alsoReturnContentOnError) { @@ -487,6 +493,10 @@ namespace GreenshotPlugin.Core { LOG.ErrorFormat("Content: {0}", errorContent); } LOG.Error("WebException: ", e); + if (statusCode == HttpStatusCode.Unauthorized) + { + throw new UnauthorizedAccessException(e.Message); + } throw; } finally diff --git a/GreenshotPlugin/Core/OAuthHelper.cs b/GreenshotPlugin/Core/OAuthHelper.cs index 94b73dc8c..d744caced 100644 --- a/GreenshotPlugin/Core/OAuthHelper.cs +++ b/GreenshotPlugin/Core/OAuthHelper.cs @@ -499,7 +499,7 @@ namespace GreenshotPlugin.Core { /// Authorize the token by showing the dialog /// /// The request token. - private String GetAuthorizeToken() { + private string GetAuthorizeToken() { if (string.IsNullOrEmpty(Token)) { Exception e = new Exception("The request token is not set"); throw e; @@ -532,7 +532,7 @@ namespace GreenshotPlugin.Core { /// Get the access token /// /// The access token. - private String GetAccessToken() { + private string GetAccessToken() { if (string.IsNullOrEmpty(Token) || (CheckVerifier && string.IsNullOrEmpty(Verifier))) { Exception e = new Exception("The request token and verifier were not set"); throw e; @@ -663,39 +663,36 @@ namespace GreenshotPlugin.Core { } try { Sign(method, signUrl, parametersToSign); - + // Join all parameters IDictionary newParameters = new Dictionary(); - foreach(var parameter in parametersToSign) { + foreach (var parameter in parametersToSign) { newParameters.Add(parameter); } if (additionalParameters != null) { - foreach(var parameter in additionalParameters) { + foreach (var parameter in additionalParameters) { newParameters.Add(parameter); } } return MakeRequest(method, requestURL, headers, newParameters, postData); - } catch (WebException wEx) { - lastException = wEx; - if (wEx.Response != null) { - HttpWebResponse response = wEx.Response as HttpWebResponse; - if (response != null && response.StatusCode == HttpStatusCode.Unauthorized) { - Token = null; - TokenSecret = null; - // Remove oauth keys, so they aren't added double - List keysToDelete = new List(); - foreach (string parameterKey in parametersToSign.Keys) { - if (parameterKey.StartsWith(OAUTH_PARAMETER_PREFIX)) { - keysToDelete.Add(parameterKey); - } - } - foreach(string keyToDelete in keysToDelete) { - parametersToSign.Remove(keyToDelete); - } - continue; + } catch (UnauthorizedAccessException uaEx) { + lastException = uaEx; + Token = null; + TokenSecret = null; + // Remove oauth keys, so they aren't added double + List keysToDelete = new List(); + foreach (string parameterKey in parametersToSign.Keys) + { + if (parameterKey.StartsWith(OAUTH_PARAMETER_PREFIX)) + { + keysToDelete.Add(parameterKey); } } - throw; + foreach (string keyToDelete in keysToDelete) + { + parametersToSign.Remove(keyToDelete); + } + continue; } } if (lastException != null) { diff --git a/GreenshotPlugin/Core/SourceForgeHelper.cs b/GreenshotPlugin/Core/SourceForgeHelper.cs index c54c27ff5..ba1f7098c 100644 --- a/GreenshotPlugin/Core/SourceForgeHelper.cs +++ b/GreenshotPlugin/Core/SourceForgeHelper.cs @@ -97,7 +97,7 @@ namespace GreenshotPlugin.Core { /// public class SourceForgeHelper { private static ILog LOG = LogManager.GetLogger(typeof(SourceForgeHelper)); - private const String RSSFEED = "http://getgreenshot.org/project-feed/"; + private const string RSSFEED = "http://getgreenshot.org/project-feed/"; /// /// This is using the HTTP HEAD Method to check if the RSS Feed is modified after the supplied date diff --git a/GreenshotPlugin/Core/WindowsHelper.cs b/GreenshotPlugin/Core/WindowsHelper.cs index 15dab04d1..4b69f88ad 100644 --- a/GreenshotPlugin/Core/WindowsHelper.cs +++ b/GreenshotPlugin/Core/WindowsHelper.cs @@ -1490,7 +1490,7 @@ namespace GreenshotPlugin.Core { /// /// IntPtr with the windows handle /// String with ClassName - public static String GetClassName(IntPtr hWnd) { + public static string GetClassName(IntPtr hWnd) { StringBuilder classNameBuilder = new StringBuilder(260, 260); User32.GetClassName(hWnd, classNameBuilder, classNameBuilder.Capacity); return classNameBuilder.ToString(); diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index e9c313f6f..917a12654 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -1,5 +1,5 @@  - + {5B924697-4DCD-4F98-85F1-105CB84B7341} @@ -14,6 +14,11 @@ 4 false + + + + + 3.5 diff --git a/GreenshotPlugin/UnmanagedHelpers/User32.cs b/GreenshotPlugin/UnmanagedHelpers/User32.cs index 90aabc66e..416a38823 100644 --- a/GreenshotPlugin/UnmanagedHelpers/User32.cs +++ b/GreenshotPlugin/UnmanagedHelpers/User32.cs @@ -142,8 +142,6 @@ namespace GreenshotPlugin.UnmanagedHelpers { public static extern bool ShowScrollBar(IntPtr hwnd, ScrollBarDirection scrollBar, bool show); [DllImport("user32", SetLastError = true)] public static extern int SetScrollPos(IntPtr hWnd, Orientation nBar, int nPos, bool bRedraw); - [DllImport("user32", SetLastError=true)] - public static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam); [DllImport("user32", SetLastError = true)] public static extern RegionResult GetWindowRgn(IntPtr hWnd, SafeHandle hRgn); [DllImport("user32", SetLastError = true)]