From 8b8ec8597367d13527e9e7a46e184ee99a7d5f32 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 2 Mar 2018 00:06:21 +0100 Subject: [PATCH] dcc: Disable DCC features until they're ready for public consumption Don't advertise that we support DCC when we actually don't yet. Also, don't create the transfer widget and settings page for now. --- src/client/client.cpp | 2 ++ src/common/quassel.cpp | 3 +++ src/common/quassel.h | 2 +- src/qtui/mainwin.cpp | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client/client.cpp b/src/client/client.cpp index ca951da5..dd20ca0a 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -426,6 +426,7 @@ void Client::setSyncedToCore() _highlightRuleManager = new HighlightRuleManager(this); p->synchronize(highlightRuleManager()); +/* not ready yet // create TransferManager and DccConfig if core supports them Q_ASSERT(!_dccConfig); Q_ASSERT(!_transferManager); @@ -436,6 +437,7 @@ void Client::setSyncedToCore() _transferModel->setManager(_transferManager); p->synchronize(transferManager()); } +*/ // trigger backlog request once all active bufferviews are initialized connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(finishConnectionInitialization())); diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 2e1e46a5..8c2b7b49 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -379,6 +379,9 @@ Quassel::Features Quassel::features() for (int i = 1; i <= NumFeatures; i <<= 1) feats |= (Feature)i; + // Disable DCC until it is ready + feats &= ~Feature::DccFileTransfer; + return feats; } diff --git a/src/common/quassel.h b/src/common/quassel.h index e69a898f..c9bd3aba 100644 --- a/src/common/quassel.h +++ b/src/common/quassel.h @@ -74,7 +74,7 @@ public: CapNegotiation = 0x0020, /// IRCv3 capability negotiation, account tracking VerifyServerSSL = 0x0040, /// IRC server SSL validation CustomRateLimits = 0x0080, /// IRC server custom message rate limits - DccFileTransfer = 0x0100, + DccFileTransfer = 0x0100, /// DCC file transfer support (forcefully disabled for now) AwayFormatTimestamp = 0x0200, /// Timestamp formatting in away (e.g. %%hh:mm%%) Authenticators = 0x0400, /// Whether or not the core supports auth backends. BufferActivitySync = 0x0800, /// Sync buffer activity status diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 636f2136..923a3849 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -226,7 +226,7 @@ void MainWin::init() setupActions(); setupBufferWidget(); setupMenus(); - setupTransferWidget(); + // setupTransferWidget(); not ready yet setupChatMonitor(); setupTopicWidget(); setupInputWidget(); @@ -1454,7 +1454,7 @@ void MainWin::showSettingsDlg() dlg->registerSettingsPage(new NetworksSettingsPage(dlg)); dlg->registerSettingsPage(new AliasesSettingsPage(dlg)); dlg->registerSettingsPage(new IgnoreListSettingsPage(dlg)); - dlg->registerSettingsPage(new DccSettingsPage(dlg)); + // dlg->registerSettingsPage(new DccSettingsPage(dlg)); not ready yet // Category: Remote Cores if (Quassel::runMode() != Quassel::Monolithic) { -- 2.20.1