From cc9f9ba0bb389b014929af6f8f53e3248463612d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 9 Oct 2011 10:05:13 +0200
Subject: Filter chat view actions again.


diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 7bb5818..97ce992 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -57,9 +57,7 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent), f
 
 	webPage_ = new QWebPage(this);
 	webPage_->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-#ifdef SWIFT_EXPERIMENTAL_FT
-	webPage_->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-#endif
+	//webPage_->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
 	webView_->setPage(webPage_);
 	connect(webPage_, SIGNAL(selectionChanged()), SLOT(copySelectionToClipboard()));
 
diff --git a/Swift/QtUI/QtWebView.cpp b/Swift/QtUI/QtWebView.cpp
index d393b6c..388f06a 100644
--- a/Swift/QtUI/QtWebView.cpp
+++ b/Swift/QtUI/QtWebView.cpp
@@ -47,7 +47,6 @@ void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
 	// Filter out the relevant actions from the standard actions
 	
 	QMenu* menu = page()->createStandardContextMenu();
-	/*
 	QList<QAction*> actions(menu->actions());
 	for (int i = 0; i < actions.size(); ++i) {
 		QAction* action = actions.at(i);
@@ -61,7 +60,7 @@ void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
 		if (removeAction) {
 			menu->removeAction(action);
 		}
-	}*/
+	}
 
 	// Add our own custom actions
 	menu->addAction(tr("Clear"), this, SIGNAL(clearRequested()));
-- 
cgit v0.10.2-6-g49f6