[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7a69787c5bf2798c14b9d7dc41a74383a342109d
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 15:22:51 2009 +0000

    2009-10-07  Antonio Gomes  <tonikitoo at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Get rid of useless loadFailed signal in QGraphicsWebView
            https://bugs.webkit.org/show_bug.cgi?id=30166
    
            * Api/qgraphicswebview.cpp:
            (QGraphicsWebViewPrivate::_q_doLoadFinished):
            * Api/qgraphicswebview.h:
            * QGVLauncher/main.cpp:
            (MainWindow::init):
            (MainWindow::loadFinished):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index aa7680f..c267745 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -83,10 +83,7 @@ void QGraphicsWebViewPrivate::_q_doLoadFinished(bool success)
     if (q->title().isEmpty())
         emit q->urlChanged(q->url());
 
-    if (success)
-        emit q->loadFinished();
-    else
-        emit q->loadFailed();
+    emit q->loadFinished(success);
 }
 
 void QGraphicsWebViewPrivate::scroll(int dx, int dy, const QRect& rectToScroll)
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index a8478d8..26f7374 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -95,8 +95,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void loadStarted();
-    void loadFinished();
-    void loadFailed();
+    void loadFinished(bool);
 
     void progressChanged(qreal);
     void interactivityChanged();
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2980736..d80cbdf 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-07  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Get rid of useless loadFailed signal in QGraphicsWebView
+        https://bugs.webkit.org/show_bug.cgi?id=30166
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_doLoadFinished):
+        * Api/qgraphicswebview.h:
+        * QGVLauncher/main.cpp:
+        (MainWindow::init):
+        (MainWindow::loadFinished):
+
 2009-10-07  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index 8436497..1d67c35 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -175,7 +175,7 @@ public:
 
         view->setMainWidget(scene->webView());
 
-        connect(scene->webView(), SIGNAL(loadFinished()), this, SLOT(loadFinished()));
+        connect(scene->webView(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
         connect(scene->webView(), SIGNAL(titleChanged(const QString&)), this, SLOT(setWindowTitle(const QString&)));
         connect(scene->webView()->page(), SIGNAL(windowCloseRequested()), this, SLOT(close()));
 
@@ -215,7 +215,7 @@ protected slots:
         load(urlEdit->text());
     }
 
-    void loadFinished()
+    void loadFinished(bool)
     {
         QUrl url = scene->webView()->url();
         urlEdit->setText(url.toString());

-- 
WebKit Debian packaging