[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e394d3e0dc3365611ee5b54346ee8b069e91a777
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 21:48:09 2010 +0000

    Rename WKPreferencesGetFTPDirectoryTemplatePath to WKPreferencesCopyFTPDirectoryTemplatePath
    since it copies the value.
    
    Reviewed by Oliver Hunt.
    
    * UIProcess/API/C/WKPreferences.cpp:
    (WKPreferencesCopyFTPDirectoryTemplatePath):
    * UIProcess/API/C/WKPreferencesPrivate.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73546 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c755322..cb86518 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-12-08  Sam Weinig  <sam at webkit.org>
 
+        Reviewed by Oliver Hunt.
+
+        Rename WKPreferencesGetFTPDirectoryTemplatePath to WKPreferencesCopyFTPDirectoryTemplatePath
+        since it copies the value.
+
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesCopyFTPDirectoryTemplatePath):
+        * UIProcess/API/C/WKPreferencesPrivate.h:
+
+2010-12-08  Sam Weinig  <sam at webkit.org>
+
         Reviewed by Brady Eidson.
 
         WebKit2: Can't open ftp directory
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index a7cb314..4b1a2fe 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -355,7 +355,7 @@ void WKPreferencesSetFTPDirectoryTemplatePath(WKPreferencesRef preferencesRef, W
     toImpl(preferencesRef)->setFTPDirectoryTemplatePath(toWTFString(pathRef));
 }
 
-WKStringRef WKPreferencesGetFTPDirectoryTemplatePath(WKPreferencesRef preferencesRef)
+WKStringRef WKPreferencesCopyFTPDirectoryTemplatePath(WKPreferencesRef preferencesRef)
 {
     return toCopiedAPI(toImpl(preferencesRef)->ftpDirectoryTemplatePath());
 }
diff --git a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h b/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
index 021a710..109f121 100644
--- a/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
+++ b/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
@@ -69,7 +69,7 @@ WK_EXPORT bool WKPreferencesGetForceFTPDirectoryListings(WKPreferencesRef prefer
 
 // Defaults to the empty string.
 WK_EXPORT void WKPreferencesSetFTPDirectoryTemplatePath(WKPreferencesRef preferences, WKStringRef path);
-WK_EXPORT WKStringRef WKPreferencesGetFTPDirectoryTemplatePath(WKPreferencesRef preferences);
+WK_EXPORT WKStringRef WKPreferencesCopyFTPDirectoryTemplatePath(WKPreferencesRef preferences);
 
 #ifdef __cplusplus
 }

-- 
WebKit Debian packaging