[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 e66695edfd60b7e537d6a7dc77fa166ef9ec4a24
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 1 12:35:35 2002 +0000

    WebKit:
    
            Build fixes (don't know why a plain build didn't catch these):
    
    	* Plugins.subproj/IFPluginView.mm: openNewWindowWithURL: is not a
    	method of the controller any more, nor are the status-related calls.
            * WebView.subproj/IFWebController.h: Un-ifdef the status calls.
    
    WebBrowser:
    
            Build fixes:
    
    	* BrowserDocument.h,
            * BrowserDocument.m:
            (-[BrowserDocument highestPriorityStatusMessage]): Make this public.
            (-[BrowserDocument _updateStatusInBrowserWindow]): Adjust for rename.
            * WebController.m:
            (-[BrowserWebController statusTextForDataSource:]): Implemented.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1480 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07898f4..295e3ac 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-07-01  Maciej Stachowiak  <mjs at apple.com>
 
+        Build fixes (don't know why a plain build didn't catch these):
+
+	* Plugins.subproj/IFPluginView.mm: openNewWindowWithURL: is not a
+	method of the controller any more, nor are the status-related calls.
+        * WebView.subproj/IFWebController.h: Un-ifdef the status calls.
+
+2002-07-01  Maciej Stachowiak  <mjs at apple.com>
+
         Part of fix for Radar 2976618 - links targeting _blank hit
 	assertion trying to set provisional data source
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 07898f4..295e3ac 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-07-01  Maciej Stachowiak  <mjs at apple.com>
 
+        Build fixes (don't know why a plain build didn't catch these):
+
+	* Plugins.subproj/IFPluginView.mm: openNewWindowWithURL: is not a
+	method of the controller any more, nor are the status-related calls.
+        * WebView.subproj/IFWebController.h: Un-ifdef the status calls.
+
+2002-07-01  Maciej Stachowiak  <mjs at apple.com>
+
         Part of fix for Radar 2976618 - links targeting _blank hit
 	assertion trying to set provisional data source
 
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 38dd588..0fff8e7 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -695,7 +695,7 @@ static char *newCString(NSString *string)
     }else{
         frame = [webFrame frameNamed:target];
         if(!frame){
-            [webController openNewWindowWithURL:url];
+            [[webController windowContext] openNewWindowWithURL:url];
             // FIXME: Need to send NPP_URLNotify at the right time.
             // FIXME: Need to name new frame
             if(notifyData)
@@ -827,7 +827,7 @@ static char *newCString(NSString *string)
 {
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Status: %s\n", message);
     if(webController){
-        [webController setStatusText:[NSString stringWithCString:message] forDataSource:webDataSource];
+        [[webController windowContext] setStatusText:[NSString stringWithCString:message] forDataSource:webDataSource];
     }
 }
 
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 38dd588..0fff8e7 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -695,7 +695,7 @@ static char *newCString(NSString *string)
     }else{
         frame = [webFrame frameNamed:target];
         if(!frame){
-            [webController openNewWindowWithURL:url];
+            [[webController windowContext] openNewWindowWithURL:url];
             // FIXME: Need to send NPP_URLNotify at the right time.
             // FIXME: Need to name new frame
             if(notifyData)
@@ -827,7 +827,7 @@ static char *newCString(NSString *string)
 {
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Status: %s\n", message);
     if(webController){
-        [webController setStatusText:[NSString stringWithCString:message] forDataSource:webDataSource];
+        [[webController windowContext] setStatusText:[NSString stringWithCString:message] forDataSource:webDataSource];
     }
 }
 
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index ba5b9ce..ce11b81 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -111,10 +111,8 @@ typedef enum {
 
 - (IFWebController *)openNewWindowWithURL:(NSURL *)url;
 
-#if 0
 - (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
 - (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
-#endif
 
 - (BOOL)areToolbarsVisible;
 - (void)setToolbarsVisible:(BOOL)visible;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index ba5b9ce..ce11b81 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -111,10 +111,8 @@ typedef enum {
 
 - (IFWebController *)openNewWindowWithURL:(NSURL *)url;
 
-#if 0
 - (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
 - (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
-#endif
 
 - (BOOL)areToolbarsVisible;
 - (void)setToolbarsVisible:(BOOL)visible;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index ba5b9ce..ce11b81 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -111,10 +111,8 @@ typedef enum {
 
 - (IFWebController *)openNewWindowWithURL:(NSURL *)url;
 
-#if 0
 - (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
 - (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
-#endif
 
 - (BOOL)areToolbarsVisible;
 - (void)setToolbarsVisible:(BOOL)visible;

-- 
WebKit Debian packaging