X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.cpp;h=db21c39703818b175903504801f829c1fb03b0f8;hb=535f934ed8d2d991a83ad10f34669dbc909f1c84;hp=6139ad5b60bb5c58017edd9ebcd69d171a351e6e;hpb=65d88a7f8c37e549a259aba85c52b7916b89a17d;p=quassel.git

diff --git a/src/qtui/settingspages/generalsettingspage.cpp b/src/qtui/settingspages/generalsettingspage.cpp
index 6139ad5b..db21c397 100644
--- a/src/qtui/settingspages/generalsettingspage.cpp
+++ b/src/qtui/settingspages/generalsettingspage.cpp
@@ -149,8 +149,8 @@ void GeneralSettingsPage::save() {
 
   uiSettings.setValue("AnimateTrayIcon", ui.animateTrayIcon->isChecked());
 //<<< HEAD:src/qtui/settingspages/generalsettingspage.cpp
-  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
-  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
+//  uiSettings.setValue("DisplayPopupMessages", ui.displayPopupMessages->isChecked());
+//  uiSettings.setValue("CompletionSuffix", ui.completionSuffix->text());
   
 //=======
   uiSettings.setValue("NotificationBubble", ui.bubbleBox->isChecked());