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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit abbd1ad19ee20c84aad2b7e25356e2cf01233ab0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 23:39:44 2003 +0000

    WebKit:
            As requested by Nancy, drop "Is" and "Are" from setters,
            but leave them in place on the getters.
    
            Reviewed by cblu.
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences setJavaEnabled:]):
            (-[WebPreferences setJavaScriptEnabled:]):
            (-[WebPreferences setPlugInsEnabled:]):
    
    WebBrowser:
            As requested by Nancy, drop "Is" and "Are" from setters,
            but leave them in place on the getters.
    
            Reviewed by cblu.
    
            * Preferences.subproj/SecurityPreferences.m:
            (-[SecurityPreferences toggleJavaEnabled:]):
            (-[SecurityPreferences toggleJavaScriptEnabled:]):
            (-[SecurityPreferences togglePluginsEnabled:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 622c924..9079240 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-03  Richard Williamson   <rjw at apple.com>
+
+        As requested by Nancy, drop "Is" and "Are" from setters,
+        but leave them in place on the getters.
+        
+        Reviewed by cblu.
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences setJavaEnabled:]):
+        (-[WebPreferences setJavaScriptEnabled:]):
+        (-[WebPreferences setPlugInsEnabled:]):
+
 2003-04-03  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 1926359..53cbb0c 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -145,7 +145,7 @@ extern NSString *WebPreferencesChangedNotification;
 
 /*!
     @method userStyleSheetLocation
-    @discussion The user style sheet is stored as a URL string, e.g. "file://<etc>"
+    @discussion The location of the user style sheet.
 */
 - (NSURL *)userStyleSheetLocation;
 
@@ -156,7 +156,7 @@ extern NSString *WebPreferencesChangedNotification;
 - (void)setUserStyleSheetLocation:(NSURL *)URL;
 
 /*!
-    @method JavaEnabled
+    @method isJavaEnabled
 */
 - (BOOL)isJavaEnabled;
 
@@ -164,10 +164,10 @@ extern NSString *WebPreferencesChangedNotification;
     @method setJavaEnabled:
     @param flag
 */
-- (void)setIsJavaEnabled:(BOOL)flag;
+- (void)setJavaEnabled:(BOOL)flag;
 
 /*!
-    @method JavaScriptEnabled
+    @method isJavaScriptEnabled
 */
 - (BOOL)isJavaScriptEnabled;
 
@@ -175,7 +175,7 @@ extern NSString *WebPreferencesChangedNotification;
     @method setJavaScriptEnabled:
     @param flag
 */
-- (void)setIsJavaScriptEnabled:(BOOL)flag;
+- (void)setJavaScriptEnabled:(BOOL)flag;
 
 /*!
     @method JavaScriptCanOpenWindowsAutomatically
@@ -189,15 +189,15 @@ extern NSString *WebPreferencesChangedNotification;
 - (void)setJavaScriptCanOpenWindowsAutomatically:(BOOL)flag;
 
 /*!
-    @method pluginsEnabled
+    @method arePlugInsEnabled
 */
 - (BOOL)arePlugInsEnabled;
 
 /*!
-    @method setPluginsEnabled:
+    @method setPlugInsEnabled:
     @param flag
 */
-- (void)setArePlugInsEnabled:(BOOL)flag;
+- (void)setPlugInsEnabled:(BOOL)flag;
 
 /*!
     @method allowAnimatedImages
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index af9aab6..d889a22 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -273,7 +273,7 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
     return [self _boolValueForKey: WebKitJavaEnabledPreferenceKey];
 }
 
-- (void)setIsJavaEnabled:(BOOL)flag
+- (void)setJavaEnabled:(BOOL)flag
 {
     [self _setBoolValue: flag forKey: WebKitJavaEnabledPreferenceKey];
 }
@@ -283,7 +283,7 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
     return [self _boolValueForKey: WebKitJavaScriptEnabledPreferenceKey];
 }
 
-- (void)setIsJavaScriptEnabled:(BOOL)flag
+- (void)setJavaScriptEnabled:(BOOL)flag
 {
     [self _setBoolValue: flag forKey: WebKitJavaScriptEnabledPreferenceKey];
 }
@@ -303,7 +303,7 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
     return [self _boolValueForKey: WebKitPluginsEnabledPreferenceKey];
 }
 
-- (void)setArePlugInsEnabled:(BOOL)flag
+- (void)setPlugInsEnabled:(BOOL)flag
 {
     [self _setBoolValue: flag forKey: WebKitPluginsEnabledPreferenceKey];
 }

-- 
WebKit Debian packaging