From c01c1ad4823a3e49c9526c19560dd5ce4fe30cb8 Mon Sep 17 00:00:00 2001
From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Sun, 28 Jun 2020 01:54:36 -0400
Subject: [PATCH] client: Default to AsNeeded backlog fetching

Default to the AsNeeded backlog requester for better performance with
modern (v0.13.0 or newer) Quassel cores.  Legacy cores are handled
as well.

This modifies new installs and existing configurations if the prior
default value wasn't changed.  Might be worth a mention in the release
notes given the potential performance improvement.
---
 src/client/backlogsettings.cpp                     | 4 ++--
 src/qtui/settingspages/backlogsettingspage.cpp     | 2 +-
 src/qtui/settingspages/backlogsettingspage.ui      | 5 ++++-
 src/qtui/settingspages/chatmonitorsettingspage.cpp | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/client/backlogsettings.cpp b/src/client/backlogsettings.cpp
index fda30762..a90d4e5a 100644
--- a/src/client/backlogsettings.cpp
+++ b/src/client/backlogsettings.cpp
@@ -26,10 +26,10 @@ BacklogSettings::BacklogSettings()
 
 int BacklogSettings::requesterType() const
 {
-    int _requesterType = localValue("RequesterType", BacklogRequester::PerBufferUnread).toInt();
+    int _requesterType = localValue("RequesterType", BacklogRequester::AsNeeded).toInt();
     if (_requesterType == BacklogRequester::GlobalUnread) {
         // GlobalUnread is currently disabled; don't allow it to be used.  Reset to default instead.
-        _requesterType = BacklogRequester::PerBufferUnread;
+        _requesterType = BacklogRequester::AsNeeded;
     }
     return _requesterType;
 }
diff --git a/src/qtui/settingspages/backlogsettingspage.cpp b/src/qtui/settingspages/backlogsettingspage.cpp
index e7978613..98305c7e 100644
--- a/src/qtui/settingspages/backlogsettingspage.cpp
+++ b/src/qtui/settingspages/backlogsettingspage.cpp
@@ -46,7 +46,7 @@ bool BacklogSettingsPage::hasDefaults() const
 
 void BacklogSettingsPage::defaults()
 {
-    ui.requesterType->setCurrentIndex(BacklogRequester::PerBufferUnread - 1);
+    ui.requesterType->setCurrentIndex(BacklogRequester::AsNeeded - 1);
 
     SettingsPage::defaults();
 }
diff --git a/src/qtui/settingspages/backlogsettingspage.ui b/src/qtui/settingspages/backlogsettingspage.ui
index feac9cd4..b8c70bf0 100644
--- a/src/qtui/settingspages/backlogsettingspage.ui
+++ b/src/qtui/settingspages/backlogsettingspage.ui
@@ -94,6 +94,9 @@
      </item>
      <item>
       <widget class="QComboBox" name="requesterType">
+       <property name="currentIndex">
+        <number>2</number>
+       </property>
        <item>
         <property name="text">
          <string>Fixed amount per chat</string>
@@ -134,7 +137,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/qtui/settingspages/chatmonitorsettingspage.cpp b/src/qtui/settingspages/chatmonitorsettingspage.cpp
index 414cd6d7..5af07e3e 100644
--- a/src/qtui/settingspages/chatmonitorsettingspage.cpp
+++ b/src/qtui/settingspages/chatmonitorsettingspage.cpp
@@ -73,7 +73,7 @@ ChatMonitorSettingsPage::ChatMonitorSettingsPage(QWidget* parent)
 
     // AsNeededBacklogRequester conflicts with showing backlog in Chat Monitor
     BacklogSettings backlogSettings;
-    backlogSettings.initAndNotify("RequesterType", this, &ChatMonitorSettingsPage::setRequesterType, BacklogRequester::PerBufferUnread);
+    backlogSettings.initAndNotify("RequesterType", this, &ChatMonitorSettingsPage::setRequesterType, BacklogRequester::AsNeeded);
 }
 
 bool ChatMonitorSettingsPage::hasDefaults() const
-- 
2.20.1