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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b0d2f6faea7b329451b42603deccf29c416d852f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 14 21:53:32 2003 +0000

    WebKit:
    
            Reviewed by Don.
    
    	- revert premature controller --> webView renaming, it's causing
    	problems with window opening and such.
    
            * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
    
    WebBrowser:
    
            Reviewed by Don.
    
    	- add controller: argument to a method that now needs it.
    
    	(informal protocols suck!)
    
            * BrowserWebController.m:
            (-[BrowserWebController controller:runOpenPanelForFileButtonWithResultListener:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eaa2159..06fb86a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Don.
+
+	- revert premature controller --> webView renaming, it's causing
+	problems with window opening and such.
+	
+        * WebView.subproj/WebDefaultWindowOperationsDelegate.m:
+
 2003-03-14  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3197872 - Standalone plug-in content isn't restarted when switching tabs
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index 28547a6..d7492ed 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -34,27 +34,27 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
     return nil;
 }
 
-- (void)webViewShowWindow: (WebController *)wv;
+- (void)controllerShowWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewShowWindowBehindFrontmost: (WebController *)wv;
+- (void)controllerShowWindowBehindFrontmost: (WebController *)wv;
 {
 }
 
-- (void)webViewCloseWindow: (WebController *)wv;
+- (void)controllerCloseWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewFocusWindow: (WebController *)wv;
+- (void)controllerFocusWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewUnfocusWindow: (WebController *)wv;
+- (void)controllerUnfocusWindow: (WebController *)wv;
 {
 }
 
-- (NSResponder *)webViewFirstResponderInWindow: (WebController *)wv;
+- (NSResponder *)controllerFirstResponderInWindow: (WebController *)wv;
 {
     return nil;
 }
@@ -67,7 +67,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (NSString *)webViewStatusText: (WebController *)wv;
+- (NSString *)controllerStatusText: (WebController *)wv;
 {
     return nil;
 }
@@ -76,7 +76,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewAreToolbarsVisible: (WebController *)wv;
+- (BOOL)controllerAreToolbarsVisible: (WebController *)wv;
 {
     return NO;
 }
@@ -85,7 +85,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewIsStatusBarVisible: (WebController *)wv;
+- (BOOL)controllerIsStatusBarVisible: (WebController *)wv;
 {
     return NO;
 }
@@ -94,7 +94,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewIsResizable: (WebController *)wv;
+- (BOOL)controllerIsResizable: (WebController *)wv;
 {
     return NO;
 }
@@ -107,7 +107,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (NSRect)webViewFrame: (WebController *)wv;
+- (NSRect)controllerFrame: (WebController *)wv;
 {
     return NSMakeRect (0,0,0,0);
 }
diff --git a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
index 28547a6..d7492ed 100644
--- a/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultWindowOperationsDelegate.m
@@ -34,27 +34,27 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
     return nil;
 }
 
-- (void)webViewShowWindow: (WebController *)wv;
+- (void)controllerShowWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewShowWindowBehindFrontmost: (WebController *)wv;
+- (void)controllerShowWindowBehindFrontmost: (WebController *)wv;
 {
 }
 
-- (void)webViewCloseWindow: (WebController *)wv;
+- (void)controllerCloseWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewFocusWindow: (WebController *)wv;
+- (void)controllerFocusWindow: (WebController *)wv;
 {
 }
 
-- (void)webViewUnfocusWindow: (WebController *)wv;
+- (void)controllerUnfocusWindow: (WebController *)wv;
 {
 }
 
-- (NSResponder *)webViewFirstResponderInWindow: (WebController *)wv;
+- (NSResponder *)controllerFirstResponderInWindow: (WebController *)wv;
 {
     return nil;
 }
@@ -67,7 +67,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (NSString *)webViewStatusText: (WebController *)wv;
+- (NSString *)controllerStatusText: (WebController *)wv;
 {
     return nil;
 }
@@ -76,7 +76,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewAreToolbarsVisible: (WebController *)wv;
+- (BOOL)controllerAreToolbarsVisible: (WebController *)wv;
 {
     return NO;
 }
@@ -85,7 +85,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewIsStatusBarVisible: (WebController *)wv;
+- (BOOL)controllerIsStatusBarVisible: (WebController *)wv;
 {
     return NO;
 }
@@ -94,7 +94,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (BOOL)webViewIsResizable: (WebController *)wv;
+- (BOOL)controllerIsResizable: (WebController *)wv;
 {
     return NO;
 }
@@ -107,7 +107,7 @@ static WebDefaultWindowOperationsDelegate *sharedDelegate = nil;
 {
 }
 
-- (NSRect)webViewFrame: (WebController *)wv;
+- (NSRect)controllerFrame: (WebController *)wv;
 {
     return NSMakeRect (0,0,0,0);
 }

-- 
WebKit Debian packaging