diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/Greenshot/Forms/SettingsForm.Designer.cs
index 7e693debb..6410a76a8 100644
--- a/Greenshot/Forms/SettingsForm.Designer.cs
+++ b/Greenshot/Forms/SettingsForm.Designer.cs
@@ -1042,7 +1042,7 @@ namespace Greenshot {
this.checkbox_checkunstableupdates.LanguageKey = "expertsettings_checkunstableupdates";
this.checkbox_checkunstableupdates.Location = new System.Drawing.Point(10, 187);
this.checkbox_checkunstableupdates.Name = "checkbox_checkunstableupdates";
- this.checkbox_checkunstableupdates.PropertyName = "CheckUnstable";
+ this.checkbox_checkunstableupdates.PropertyName = "CheckForUnstable";
this.checkbox_checkunstableupdates.Size = new System.Drawing.Size(394, 24);
this.checkbox_checkunstableupdates.TabIndex = 29;
this.checkbox_checkunstableupdates.UseVisualStyleBackColor = true;
diff --git a/Greenshot/Helpers/UpdateHelper.cs b/Greenshot/Helpers/UpdateHelper.cs
index 745b9bef5..e8f30dc3a 100644
--- a/Greenshot/Helpers/UpdateHelper.cs
+++ b/Greenshot/Helpers/UpdateHelper.cs
@@ -142,7 +142,7 @@ namespace Greenshot.Experimental {
// the current version is a release or release candidate AND check unstable is turned off.
if (rssFile.isUnstable) {
// Skip if we shouldn't check unstables
- if ((conf.isRelease || conf.isReleaseCandidate) && !conf.CheckUnstable) {
+ if ((conf.isRelease || conf.isReleaseCandidate) && !conf.CheckForUnstable) {
continue;
}
}
@@ -150,7 +150,7 @@ namespace Greenshot.Experimental {
// if the file is a release candidate, we will skip it when:
// the current version is a release AND check unstable is turned off.
if (rssFile.isReleaseCandidate) {
- if (conf.isRelease && !conf.CheckUnstable) {
+ if (conf.isRelease && !conf.CheckForUnstable) {
continue;
}
}
diff --git a/Greenshot/releases/additional_files/readme.txt b/Greenshot/releases/additional_files/readme.txt
index e28005cb1..a95b5afd4 100644
--- a/Greenshot/releases/additional_files/readme.txt
+++ b/Greenshot/releases/additional_files/readme.txt
@@ -4,7 +4,7 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a
CHANGE LOG:
We changed the version to 1.0 after 5 years it should no longer have a "beta" feeling!
-1.0.6 build 2227 Release
+1.0.6 build 2228 Release
Some features we added since 0.8:
* General: Greenshot will now run in 64 bit mode, if the OS supports it.
diff --git a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj
index e3153710d..c563346a3 100644
--- a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj
+++ b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj
@@ -59,7 +59,7 @@
-
+
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
index 0a7efd043..5d47ac629 100644
--- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
+++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
@@ -13,13 +13,13 @@
4
false
OnBuildSuccess
-
-
+ Client
..\Greenshot\Lib\log4net.dll
+ False
@@ -31,6 +31,9 @@
+
+ 3.5
+
3.0
@@ -79,72 +82,15 @@
True
Reference.map
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
-
- Reference.map
-
- Always
+ Never
- Always
+ Never
- Always
+ Never
@@ -188,6 +134,7 @@
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
+ False
diff --git a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj
index d695b8b84..4f34676ea 100644
--- a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj
+++ b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj
@@ -52,7 +52,7 @@
-
+
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj
index 26f147b41..81237ccdd 100644
--- a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj
+++ b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj
@@ -14,6 +14,7 @@
false
Always
3.5
+
@@ -55,7 +56,7 @@
-
+
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj
index 6024e1e67..df9533c16 100644
--- a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj
+++ b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj
@@ -15,7 +15,7 @@
Always
3.5
- C:\Users\Melle\AppData\Roaming\ICSharpCode/SharpDevelop4\Settings.SourceAnalysis
+
@@ -55,7 +55,7 @@
-
+
{5B924697-4DCD-4F98-85F1-105CB84B7341}
GreenshotPlugin
diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs
index 59a44a6e4..73468af52 100644
--- a/GreenshotPlugin/Core/CoreConfiguration.cs
+++ b/GreenshotPlugin/Core/CoreConfiguration.cs
@@ -176,8 +176,8 @@ namespace GreenshotPlugin.Core {
[IniProperty("MinimizeWorkingSetSize", Description="Optimize memory footprint, but with a performance penalty!", DefaultValue="False")]
public bool MinimizeWorkingSetSize;
- [IniProperty("CheckUnstable", Description = "Also check for unstable version updates", DefaultValue = "False")]
- public bool CheckUnstable;
+ [IniProperty("CheckForUnstable", Description = "Also check for unstable version updates", DefaultValue = "False")]
+ public bool CheckForUnstable;
[IniProperty("ActiveTitleFixes", Description="The fixes that are active.")]
public List ActiveTitleFixes;
@@ -294,7 +294,7 @@ namespace GreenshotPlugin.Core {
///
public override void AfterLoad() {
// Comment with releases
- // CheckUnstable = true;
+ // CheckForUnstable = true;
if (OutputDestinations == null) {
OutputDestinations = new List();