diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKit/gtk/webkit/webkitwebinspector.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKit/gtk/webkit/webkitwebinspector.cpp')
-rw-r--r-- | WebKit/gtk/webkit/webkitwebinspector.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp index ee3c8cd..f207906 100644 --- a/WebKit/gtk/webkit/webkitwebinspector.cpp +++ b/WebKit/gtk/webkit/webkitwebinspector.cpp @@ -127,7 +127,6 @@ static void webkit_web_inspector_class_init(WebKitWebInspectorClass* klass) * WebKitWebInspector::inspect-web-view: * @web_inspector: the object on which the signal is emitted * @web_view: the #WebKitWebView which will be inspected - * @return: a newly allocated #WebKitWebView or %NULL * * Emitted when the user activates the 'inspect' context menu item * to inspect a web view. The application which is interested in @@ -138,6 +137,8 @@ static void webkit_web_inspector_class_init(WebKitWebInspectorClass* klass) * #WebKitWebView instance you create; the widget to which you add * it will do that. * + * Return value: (transfer none): a newly allocated #WebKitWebView or %NULL + * * Since: 1.0.3 */ webkit_web_inspector_signals[INSPECT_WEB_VIEW] = g_signal_new("inspect-web-view", @@ -476,7 +477,7 @@ webkit_web_inspector_set_inspector_client(WebKitWebInspector* web_inspector, Web /** * webkit_web_inspector_show: - * @web_inspector: the #WebKitWebInspector that will be shown + * @webInspector: the #WebKitWebInspector that will be shown * * Causes the Web Inspector to be shown. * @@ -537,7 +538,7 @@ void webkit_web_inspector_inspect_coordinates(WebKitWebInspector* webInspector, /** * webkit_web_inspector_close: - * @web_inspector: the #WebKitWebInspector that will be closed + * @webInspector: the #WebKitWebInspector that will be closed * * Causes the Web Inspector to be closed. * |