Merge branch 'master' into moderation

src/widgets/settingspages/GeneralPage.cpp

@@ -451,6 +451,16 @@ void GeneralPage::initLayout(SettingsLayout &layout)
         layout.addCheckbox("Open links in incognito/private mode",
                            s.openLinksIncognito);
     }
+
+#ifdef Q_OS_LINUX
+    if (!getPaths()->isPortable())
+    {
+        layout.addCheckbox(
+            "Use libsecret/KWallet/Gnome keychain to secure passwords",
+            s.useKeyring);
+    }
+#endif
+
     layout.addCheckbox("Show moderation messages", s.hideModerationActions,
                        true);
     layout.addCheckbox("Random username color for users who never set a color",
@@ -486,6 +496,9 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addCheckbox("Load message history on connect",
                        s.loadTwitchMessageHistoryOnConnect);
 
+    layout.addCheckbox("Show unhandled irc messages",
+                       s.showUnhandledIrcMessages);
+
     layout.addTitle("Cache");
     layout.addDescription(
         "Files that are used often (such as emotes) are saved to disk to "