[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:15:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 872256b2e9152e5986a4e49e105a9b7144c499ae
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 30 18:55:51 2002 +0000
Use NSWorkspace methods instead of Launch Services and Finder functions.
* MIME.subproj/IFDownloadHandler.h:
* MIME.subproj/IFDownloadHandler.mm:
* WebView.subproj/IFWebFrame.mm:
(-[IFWebFrame setProvisionalDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8479d4b..137d709 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-30 Chris Blumenberg <cblu at apple.com>
+
+ Use NSWorkspace methods instead of Launch Services and Finder functions.
+
+ * MIME.subproj/IFDownloadHandler.h:
+ * MIME.subproj/IFDownloadHandler.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ (-[IFWebFrame setProvisionalDataSource:]):
+
=======
2002-05-30 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8479d4b..137d709 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-30 Chris Blumenberg <cblu at apple.com>
+
+ Use NSWorkspace methods instead of Launch Services and Finder functions.
+
+ * MIME.subproj/IFDownloadHandler.h:
+ * MIME.subproj/IFDownloadHandler.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ (-[IFWebFrame setProvisionalDataSource:]):
+
=======
2002-05-30 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/MIME.subproj/IFDownloadHandler.h b/WebKit/MIME.subproj/IFDownloadHandler.h
index b8fa0c1..dba6d02 100644
--- a/WebKit/MIME.subproj/IFDownloadHandler.h
+++ b/WebKit/MIME.subproj/IFDownloadHandler.h
@@ -16,5 +16,4 @@
- initWithDataSource:(IFWebDataSource *)dSource;
- (void)downloadCompletedWithData:(NSData *)data;
-+ (void) launchURL:(NSURL *) url;
@end
diff --git a/WebKit/MIME.subproj/IFDownloadHandler.mm b/WebKit/MIME.subproj/IFDownloadHandler.mm
index 51add67..03fd257 100644
--- a/WebKit/MIME.subproj/IFDownloadHandler.mm
+++ b/WebKit/MIME.subproj/IFDownloadHandler.mm
@@ -28,7 +28,8 @@
{
NSString *path = [dataSource _downloadPath];
NSFileManager *fileManager;
-
+ NSWorkspace *workspace;
+
// FIXME: Should probably not replace existing file
// FIXME: Should report error if there is one
fileManager = [NSFileManager defaultManager];
@@ -37,16 +38,13 @@
// Send Finder notification
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Notifying Finder");
- FNNotifyByPath((UInt8 *)[[path stringByDeletingLastPathComponent] UTF8String], kFNDirectoryModifiedMessage, kNilOptions);
+ workspace = [NSWorkspace sharedWorkspace];
+ [workspace noteFileSystemChanged:path];
if([dataSource contentPolicy] == IFContentPolicyOpenExternally){
- [[self class] launchURL:[NSURL fileURLWithPath:path]];
+ [workspace openFile:path];
}
}
-+ (void) launchURL:(NSURL *) url{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD,"Launching: %s", [[url absoluteString] cString]);
- LSOpenCFURLRef((CFURLRef)url, NULL);
-}
@end
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 19b2109..f426bad 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -153,12 +153,11 @@
}
else if(urlPolicy == IFURLPolicyOpenExternally){
- [IFDownloadHandler launchURL:[newDataSource inputURL]];
+ return [[NSWorkspace sharedWorkspace] openURL:[newDataSource inputURL]];
}
// Do nothing in the IFURLPolicyIgnore case.
-
- //FIXME: When do we return NO?
+
return YES;
}
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 19b2109..f426bad 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -153,12 +153,11 @@
}
else if(urlPolicy == IFURLPolicyOpenExternally){
- [IFDownloadHandler launchURL:[newDataSource inputURL]];
+ return [[NSWorkspace sharedWorkspace] openURL:[newDataSource inputURL]];
}
// Do nothing in the IFURLPolicyIgnore case.
-
- //FIXME: When do we return NO?
+
return YES;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list