[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 11474f68e2634f6717eadedc353574b987b1713f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 23 03:43:13 2002 +0000

    WebKit:
    
    	2002-11-22  Chris Blumenberg  <cblu at apple.com>
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient continueAfterContentPolicy:response:]): Added a FIXME around saveFilenameForResponse:andRequest: because the API expects a path but is asking for a filename.
    
    WebBrowser:
    
    	Fixed: 3049735 - no default location for downloads
    
    	InternetConfig was giving an empty string for the download path. Now, when this happens, we set the download directory in InternetConfig to the Desktop.
    
            * BrowserWebController.m:
            (-[BrowserWebController saveFilenameForResponse:andRequest:]): Added a FIXME because the API expects a path but is asking for a filename.
            * Preferences.subproj/WBPreferences.m:
            (+[WBPreferences downloadPath]): Handle nil and "" case. Set download directory to Desktop.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7626daf..e48bc40 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+	2002-11-22  Chris Blumenberg  <cblu at apple.com>
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient continueAfterContentPolicy:response:]): Added a FIXME around saveFilenameForResponse:andRequest: because the API expects a path but is asking for a filename.
+
 2002-11-22  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3104693 - QT movie doesn't show video while still downloading
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7626daf..e48bc40 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+	2002-11-22  Chris Blumenberg  <cblu at apple.com>
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient continueAfterContentPolicy:response:]): Added a FIXME around saveFilenameForResponse:andRequest: because the API expects a path but is asking for a filename.
+
 2002-11-22  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3104693 - QT movie doesn't show video while still downloading
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index fc0d8b5..d13383c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -171,7 +171,13 @@
 	[dataSource _setIsDownloading:YES];
 	
 	if ([dataSource downloadPath] == nil) {
-	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r andRequest:req];
+            // FIXME: Should this be the filename or path?
+	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r
+                                                                                            andRequest:req];
+            // FIXME: Maybe there a cleaner way handle the bad filename case?
+            if(!saveFilename || [saveFilename length] == 0){
+                saveFilename = NSHomeDirectory();
+            }
 	    [dataSource _setDownloadPath:saveFilename];
 	}
 	
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index fc0d8b5..d13383c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -171,7 +171,13 @@
 	[dataSource _setIsDownloading:YES];
 	
 	if ([dataSource downloadPath] == nil) {
-	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r andRequest:req];
+            // FIXME: Should this be the filename or path?
+	    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r
+                                                                                            andRequest:req];
+            // FIXME: Maybe there a cleaner way handle the bad filename case?
+            if(!saveFilename || [saveFilename length] == 0){
+                saveFilename = NSHomeDirectory();
+            }
 	    [dataSource _setDownloadPath:saveFilename];
 	}
 	

-- 
WebKit Debian packaging