[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

kov at webkit.org kov at webkit.org
Thu Apr 8 00:44:16 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit fb5778da6a59aa271bc4e2b11feee09ad4adcbe1
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 20:07:01 2009 +0000

    Reviewed by Xan Lopez.
    
    Remove emission of signal that does not exist.
    
    * WebCoreSupport/InspectorClientGtk.cpp:
    (WebKit::InspectorClient::inspectorDestroyed):
    (WebKit::InspectorClient::webViewDestroyed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index fbd4946..eabba9f 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-20  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Remove emission of signal that does not exist.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::inspectorDestroyed):
+        (WebKit::InspectorClient::webViewDestroyed):
+
 2009-12-20  Xan Lopez  <xlopez at igalia.com>
 
         Rubber-stamped by Gustavo Noronha.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index a06ff50..99bc627 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -44,13 +44,8 @@ InspectorClient::InspectorClient(WebKitWebView* webView)
 
 void InspectorClient::inspectorDestroyed()
 {
-    if (m_webView) {
-        gboolean handled = FALSE;
-        g_signal_emit_by_name(m_webInspector, "destroy", &handled);
-
-        /* we can now dispose our own reference */
+    if (m_webInspector)
         g_object_unref(m_webInspector);
-    }
 
     delete this;
 }
@@ -64,6 +59,7 @@ void InspectorClient::webViewDestroyed()
     // something else, and the inspector will be referenced again,
     // there.
     g_object_unref(m_webInspector);
+    m_webInspector = 0;
 }
 
 Page* InspectorClient::createPage()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list