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.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ca951da..dd20ca0 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -426,6 +426,7 @@ void Client::setSyncedToCore()
     _highlightRuleManager = new HighlightRuleManager(this);
     p->synchronize(highlightRuleManager());
 
     _highlightRuleManager = new HighlightRuleManager(this);
     p->synchronize(highlightRuleManager());
 

+/*  not ready yet

     // create TransferManager and DccConfig if core supports them
     Q_ASSERT(!_dccConfig);
     Q_ASSERT(!_transferManager);
     // 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());
     }
         _transferModel->setManager(_transferManager);
         p->synchronize(transferManager());
     }

+*/

 
     // trigger backlog request once all active bufferviews are initialized
     connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(finishConnectionInitialization()));
 
     // 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 2e1e46a..8c2b7b4 100644 (file)
--- 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;
 
     for (int i = 1; i <= NumFeatures; i <<= 1)
         feats |= (Feature)i;
 

+    // Disable DCC until it is ready
+    feats &= ~Feature::DccFileTransfer;
+

     return feats;
 }
 
     return feats;
 }
 

diff --git a/src/common/quassel.h b/src/common/quassel.h
index e69a898..c9bd3ab 100644 (file)
--- 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
         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
         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 636f213..923a384 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -226,7 +226,7 @@ void MainWin::init()
     setupActions();
     setupBufferWidget();
     setupMenus();
     setupActions();
     setupBufferWidget();
     setupMenus();

-    setupTransferWidget();
+    // setupTransferWidget(); not ready yet

     setupChatMonitor();
     setupTopicWidget();
     setupInputWidget();
     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 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) {
 
     // Category: Remote Cores
     if (Quassel::runMode() != Quassel::Monolithic) {