[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 16:04:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit aac6162b8318c448064d91ea6717fa90c76a3358
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 17:06:01 2010 +0000
2010-11-18 Andras Becsi <abecsi at inf.u-szeged.hu>
Reviewed by Csaba Osztrogonác.
[Qt][WK2] Only add user agent strings to the list which aren't listed yet.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::updateUserAgentList):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72295 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ae0aa79..dd6d50a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-18 Andras Becsi <abecsi at inf.u-szeged.hu>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt][WK2] Only add user agent strings to the list which aren't listed yet.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::updateUserAgentList):
+
2010-11-17 Adam Roben <aroben at apple.com>
Don't trigger Windows builds when chromium-win test results change
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 4c56c3b..bf763a4 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -132,8 +132,11 @@ void BrowserWindow::updateUserAgentList()
QFile file(":/useragentlist.txt");
if (file.open(QIODevice::ReadOnly)) {
- while (!file.atEnd())
- m_userAgentList << file.readLine().trimmed();
+ while (!file.atEnd()) {
+ QString agent = file.readLine().trimmed();
+ if (!m_userAgentList.contains(agent))
+ m_userAgentList << agent;
+ }
file.close();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list