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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 1bcff5feb91b3ad5a5be34181b0665a65d67a3e3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 18 00:08:53 2003 +0000

            Reviewed by Maciej.
    
            * Plugins.subproj/WebBasePluginPackage.m:
            (-[WebBasePluginPackage pathByResolvingSymlinksAndAliasesInPath:]): Pass the
            "no UI" flag, so we don't prompt the user when we're trying to load plug-ins.
            Also use OSStatus rather than OSErr so we don't miss error codes that just
            happen to have zeroes in the low 16 bits.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5f9a391..8d1a8df 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-09-17  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+        * Plugins.subproj/WebBasePluginPackage.m:
+        (-[WebBasePluginPackage pathByResolvingSymlinksAndAliasesInPath:]): Pass the
+        "no UI" flag, so we don't prompt the user when we're trying to load plug-ins.
+        Also use OSStatus rather than OSErr so we don't miss error codes that just
+        happen to have zeroes in the low 16 bits.
+
+2003-09-17  Darin Adler  <darin at apple.com>
+
         Reviewed by John.
 
         * WebCoreSupport.subproj/WebFileButton.m: (-[WebFileButton setFilename:]):
diff --git a/WebKit/Plugins.subproj/WebBasePluginPackage.m b/WebKit/Plugins.subproj/WebBasePluginPackage.m
index a913888..67d2547 100644
--- a/WebKit/Plugins.subproj/WebBasePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebBasePluginPackage.m
@@ -34,7 +34,7 @@
     NSString *newPath = [thePath stringByResolvingSymlinksInPath];
 
     FSRef fref;
-    OSErr err;
+    OSStatus err;
 
     err = FSPathMakeRef((const UInt8 *)[thePath fileSystemRepresentation], &fref, NULL);
     if (err != noErr) {
@@ -43,7 +43,7 @@
 
     Boolean targetIsFolder;
     Boolean wasAliased;
-    err = FSResolveAliasFile (&fref, TRUE, &targetIsFolder, &wasAliased);
+    err = FSResolveAliasFileWithMountFlags(&fref, TRUE, &targetIsFolder, &wasAliased, kResolveAliasFileNoUI);
     if (err != noErr) {
         return newPath;
     }

-- 
WebKit Debian packaging