[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:56:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b1b95bf04ff5a77e172615ff22c9a2d29c82f10b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 18 00:05:40 2003 +0000
Reviewed by John.
* WebCoreSupport.subproj/WebFileButton.m: (-[WebFileButton setFilename:]):
Don't call -[NSWorkspace iconForFile:] on a path that does not start with a '/'.
This can happen if JavaScript or the web page sets the path explicitly, and
adding this check avoids an unpleasant warning on the console.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fa146b2..5f9a391 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-17 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ * WebCoreSupport.subproj/WebFileButton.m: (-[WebFileButton setFilename:]):
+ Don't call -[NSWorkspace iconForFile:] on a path that does not start with a '/'.
+ This can happen if JavaScript or the web page sets the path explicitly, and
+ adding this check avoids an unpleasant warning on the console.
+
=== WebKit-106 ===
2003-09-16 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebFileButton.m b/WebKit/WebCoreSupport.subproj/WebFileButton.m
index 06cbe22..451ae13 100644
--- a/WebKit/WebCoreSupport.subproj/WebFileButton.m
+++ b/WebKit/WebCoreSupport.subproj/WebFileButton.m
@@ -131,7 +131,7 @@
_filename = copy;
[_icon release];
- if (![_filename length]) {
+ if ([_filename length] == 0 || [_filename characterAtIndex:0] != '/') {
_icon = nil;
} else {
_icon = [[[NSWorkspace sharedWorkspace] iconForFile:_filename] retain];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list