[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3f2e9322af5480adafbf71ba519a9fe331917e5f
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 16:01:27 2010 +0000

    [Qt] MiniBrowser does not starts properly
    https://bugs.webkit.org/show_bug.cgi?id=45459
    
    Patch by Balazs Kelemen <kb at inf.u-szeged.hu> on 2010-09-09
    Reviewed by Andreas Kling.
    
    Do not try set up the first window by calling newWindow on a
    newly created BrowserWindow since it creates a new object.
    * MiniBrowser/qt/BrowserWindow.cpp:
    (BrowserWindow::BrowserWindow):
    * MiniBrowser/qt/main.cpp:
    (main):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d7bc5a1..a46b723 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-09  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] MiniBrowser does not starts properly
+        https://bugs.webkit.org/show_bug.cgi?id=45459
+
+        Do not try set up the first window by calling newWindow on a
+        newly created BrowserWindow since it creates a new object.
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        * MiniBrowser/qt/main.cpp:
+        (main):
+
 2010-09-09  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index d820ff6..a703788 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -59,6 +59,9 @@ BrowserWindow::BrowserWindow()
     this->setCentralWidget(m_browser);
 
     m_browser->setFocus(Qt::OtherFocusReason);
+
+    resize(960, 640);
+    show();
 }
 
 void BrowserWindow::load(const QString& url)
@@ -70,8 +73,6 @@ void BrowserWindow::load(const QString& url)
 BrowserWindow* BrowserWindow::newWindow(const QString& url)
 {
     BrowserWindow* window = new BrowserWindow();
-    window->resize(960, 640);
-    window->show();
     window->load(url);
     return window;
 }
diff --git a/WebKitTools/MiniBrowser/qt/main.cpp b/WebKitTools/MiniBrowser/qt/main.cpp
index e73bf7b..8ff3de8 100644
--- a/WebKitTools/MiniBrowser/qt/main.cpp
+++ b/WebKitTools/MiniBrowser/qt/main.cpp
@@ -44,11 +44,11 @@ int main(int argc, char** argv) {
             urls.append("http://www.google.com");
     }
 
-    BrowserWindow* window = 0;
-    foreach (QString url, urls) {
-        window = new BrowserWindow();
-        window->newWindow(url);
-    }
+    BrowserWindow* window = new BrowserWindow();
+    window->load(urls[0]);
+
+    for (int i = 1; i < urls.size(); ++i)
+        window->newWindow(urls[i]);
 
     app.exec();
 

-- 
WebKit Debian packaging