[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2d7fbc5f3481791eecf2e154e8416420d47cb1f6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 12:56:49 2009 +0000

    2009-12-04  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Prevent the inspector from closing its wrapping widget.
            This is not necessary anymore since we now hide the embedded
            close button.
            https://bugs.webkit.org/show_bug.cgi?id=32149
    
            * WebCoreSupport/InspectorClientQt.cpp:
            (WebCore::InspectorClientQt::showWindow):
            (WebCore::InspectorClientQt::closeWindow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index cc1dc4b..9d47212 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-04  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Prevent the inspector from closing its wrapping widget.
+        This is not necessary anymore since we now hide the embedded
+        close button.
+        https://bugs.webkit.org/show_bug.cgi?id=32149
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::showWindow):
+        (WebCore::InspectorClientQt::closeWindow):
+
 2009-12-03  İsmail Dönmez  <ismail at namtrac.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index bafdb84..d5683c4 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -113,16 +113,11 @@ void InspectorClientQt::showWindow()
     updateWindowTitle();
 
     m_inspectedWebPage->d->inspectorController()->setWindowVisible(true, true);
-    // We don't allow the inspector to ask for widget visibility itself because showWindow is
-    // not always called when we want.
-    // Inspecting an element or calling QWebInspector::show() should already have made the
-    // widget visible.
 }
 
 void InspectorClientQt::closeWindow()
 {
-    if (m_inspectedWebPage->d->inspector)
-        m_inspectedWebPage->d->inspector->close();
+    m_inspectedWebPage->d->inspectorController()->setWindowVisible(false);
 }
 
 void InspectorClientQt::attachWindow()

-- 
WebKit Debian packaging