[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:06:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a7c0c70050f48e814216decca38397b19fe5e869
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 29 07:22:09 2003 +0000
Reviewed by Darin.
- fixed 3465547 - REGRESSION (100-111)?: window.prompt does not work
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::runJavaScriptPrompt): Return the result properly
instead of always returning false.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 78a11c9..2fedff4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-28 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3465547 - REGRESSION (100-111)?: window.prompt does not work
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::runJavaScriptPrompt): Return the result properly
+ instead of always returning false.
+
2003-10-28 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index b4df605..1ff2472 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1372,10 +1372,9 @@ bool KWQKHTMLPart::runJavaScriptPrompt(const QString &prompt, const QString &def
KWQ_BLOCK_EXCEPTIONS;
NSString *returnedText = nil;
- bool ok = false;
- [_bridge runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
- defaultText:defaultValue.getNSString() returningText:(NSString **)&returnedText];
+ bool ok = [_bridge runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
+ defaultText:defaultValue.getNSString() returningText:&returnedText];
if (ok) {
result = QString::fromNSString(returnedText);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list