client: Fix core sessions unsupported warning

[quassel.git] / src / qtui / coresessionwidget.cpp

diff --git a/src/qtui/coresessionwidget.cpp b/src/qtui/coresessionwidget.cpp
index d31122d..97993f4 100644 (file)
--- a/src/qtui/coresessionwidget.cpp
+++ b/src/qtui/coresessionwidget.cpp
@@ -50,28 +50,19 @@ void CoreSessionWidget::setData(QMap<QString, QVariant> map)
         ui.disconnectButton->setEnabled(true);
         ui.disconnectButton->setToolTip(tr("End the client's session, disconnecting it"));
     } else {
+        // For any active sessions to be displayed, the core must support this feature.  We can
+        // assume the client doesn't support being remotely disconnected.
+        //
+        // (During the development of 0.13, there was a period of time where active sessions existed
+        //  but did not provide the disconnect option.  We can overlook this.)
+
         // Either core or client doesn't support it, disable the option
         ui.disconnectButton->setEnabled(false);
-        if (!Client::isCoreFeatureEnabled(Quassel::Feature::RemoteDisconnect)) {
-            // Until RemoteDisconnect was implemented, the Quassel core didn't forward client
-            // features.  A client might support features and we'll never hear about it.
-            // This check shouldn't be necessary for later features if the core supports at least
-            // RemoteDisconnect.
-
-            // Core doesn't support this feature (we don't know about the client)
-            ui.disconnectButton->setToolTip(
-                        QString("<p>%1</p><p><b>%2</b><br/>%3</p>").arg(
-                            tr("End the client's session, disconnecting it"),
-                            tr("Your Quassel core does not support this feature"),
-                            tr("You need a Quassel core v0.13.0 or newer in order to end connected "
-                               "sessions.")));
-        } else {
-            // Client doesn't support this feature
-            ui.disconnectButton->setToolTip(
-                        QString("<p>%1</p><p><b>%2</b></p>").arg(
-                            tr("End the client's session, disconnecting it"),
-                            tr("This client does not support being remotely disconnected")));
-        }
+        // Assuming the client lacks support, set the tooltip accordingly
+        ui.disconnectButton->setToolTip(
+                QString("<p>%1</p><p><b>%2</b></p>").arg(
+                        tr("End the client's session, disconnecting it"),
+                        tr("This client does not support being remotely disconnected")));
     }
 
     bool success = false;