[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
kov at webkit.org
kov at webkit.org
Tue Jan 5 23:56:40 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 1f79077c6d5f97e69f7e1ac467c9889ef5cae54d
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