From: Javier Llorente <javier@opensuse.org>
Date: Fri, 6 Jan 2017 23:03:12 +0000 (+0100)
Subject: Add case 4 for new proxy type default value
X-Git-Tag: travis-deploy-test~177
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=7cdb28e433d403bbc6a992a4dc624cb624c1e14d;p=quassel.git

Add case 4 for new proxy type default value
---

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 0ef3bc58..fbc9f9a4 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -279,6 +279,17 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n
     // saved.  Exceptions will be noted below.
     // NOTE:  If you add new upgrade logic here, you MUST ALSO increase VERSION_MINOR_CURRENT in
     // migrateSettings()!  Otherwise, your upgrade logic won't ever be called.
+    case 7:
+    {
+        // New default changes: ProxyType=3 (no proxy) now means QNetworkProxy::HttpProxy
+        // So we have to change it to ProxyType=2 (QNetworkProxy::NoProxy)
+        const QString proxyType = "ProxyType";
+        if (settings.valueExists(proxyType) && settings.value(proxyType)=="3") {
+            settings.setValue(proxyType, 2);
+        }
+        // Migration complete!
+        return true;
+    }
     case 6:
     {
         // New default changes: sender colors switched around to Tango-ish theme