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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 555fca52d69986104651e615322e42f5e4d8817f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 6 21:10:31 2002 +0000

    Plugins can now set status bar text
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index cfb452e..d05d619 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -9,6 +9,7 @@
 #include <npapi.h>
 #import <WebFoundation/WebFoundation.h>
 #import <IFWebView.h>
+#import <IFBaseWebController.h>
 
 typedef struct _StreamData{
     uint16 transferMode;
@@ -34,6 +35,9 @@ typedef struct _StreamData{
     WCPlugin *plugin;
     IFPluginViewNullEventSender *eventSender;
     
+    IFBaseWebController *webController;
+    IFWebView *webView;
+    
     NPP instance;
     NPWindow window;
     NP_Port nPort;
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 99fd5a1..4c9ad93 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -11,7 +11,6 @@
 #include "kwqdebug.h"
 #include <WebFoundation/IFURLHandle.h>
 #import <IFWebDataSource.h>
-#import <IFBaseWebController.h>
 #include <WCPluginWidget.h>
 
 #ifdef __cplusplus
@@ -165,6 +164,8 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
         eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
         [eventSender sendNullEvents];
         transferred = TRUE;
+        webView = [self findSuperview:@"IFWebView"];
+        webController = [webView controller];
     }
     [self sendUpdateEvent];
 }
@@ -511,11 +512,9 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 -(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData
 {
-    IFBaseWebController *webController;
-    IFWebDataSource *dataSource;
-    IFWebView *webView;
     NSURL *newURL;
-   
+    IFWebDataSource *dataSource;
+    
     KWQDebug("NPN_GetURLNotify: %s target: %s\n", url, target);
  
     if(!strcmp(url, "")){
@@ -524,12 +523,12 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
     if(target == NULL){ // send data to plug-in if target is null
         [self newStream:[NSString stringWithCString:url] mimeType:[plugin mimeTypeForURL:[NSString stringWithCString:url]] notifyData:(void *)notifyData];
     }else if(!strcmp(target, "_self") || !strcmp(target, "_current") || !strcmp(target, "_parent") || !strcmp(target, "_top")){
-        newURL = [NSURL URLWithString:[NSString stringWithCString:url]];
-        dataSource = [[[IFWebDataSource alloc] initWithURL:newURL] autorelease];
-        webView = [self findSuperview:@"IFWebView"];
-        webController = [webView controller];
-        [[webController mainFrame] setProvisionalDataSource:dataSource];
-        [[webController mainFrame] startLoading];
+        if(webController){
+            newURL = [NSURL URLWithString:[NSString stringWithCString:url]];
+            dataSource = [[[IFWebDataSource alloc] initWithURL:newURL] autorelease];
+            [[webController mainFrame] setProvisionalDataSource:dataSource];
+            [[webController mainFrame] startLoading];
+        }
     }else if(!strcmp(target, "_blank") || !strcmp(target, "_new")){
         printf("Error: No API to open new browser window\n");
     }
@@ -574,7 +573,13 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 -(void)status:(const char *)message
 {
-    KWQDebug("NPN_Status\n");
+    IFWebDataSource *dataSource;
+    
+    KWQDebug("NPN_Status: %s\n", message);
+    if(webController){
+        dataSource = [[webController mainFrame] dataSource];
+        [webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
+    }
 }
 
 -(NPError)getValue:(NPNVariable)variable value:(void *)value
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index cfb452e..d05d619 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -9,6 +9,7 @@
 #include <npapi.h>
 #import <WebFoundation/WebFoundation.h>
 #import <IFWebView.h>
+#import <IFBaseWebController.h>
 
 typedef struct _StreamData{
     uint16 transferMode;
@@ -34,6 +35,9 @@ typedef struct _StreamData{
     WCPlugin *plugin;
     IFPluginViewNullEventSender *eventSender;
     
+    IFBaseWebController *webController;
+    IFWebView *webView;
+    
     NPP instance;
     NPWindow window;
     NP_Port nPort;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 99fd5a1..4c9ad93 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -11,7 +11,6 @@
 #include "kwqdebug.h"
 #include <WebFoundation/IFURLHandle.h>
 #import <IFWebDataSource.h>
-#import <IFBaseWebController.h>
 #include <WCPluginWidget.h>
 
 #ifdef __cplusplus
@@ -165,6 +164,8 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
         eventSender = [[IFPluginViewNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent];
         [eventSender sendNullEvents];
         transferred = TRUE;
+        webView = [self findSuperview:@"IFWebView"];
+        webController = [webView controller];
     }
     [self sendUpdateEvent];
 }
@@ -511,11 +512,9 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 -(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData
 {
-    IFBaseWebController *webController;
-    IFWebDataSource *dataSource;
-    IFWebView *webView;
     NSURL *newURL;
-   
+    IFWebDataSource *dataSource;
+    
     KWQDebug("NPN_GetURLNotify: %s target: %s\n", url, target);
  
     if(!strcmp(url, "")){
@@ -524,12 +523,12 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
     if(target == NULL){ // send data to plug-in if target is null
         [self newStream:[NSString stringWithCString:url] mimeType:[plugin mimeTypeForURL:[NSString stringWithCString:url]] notifyData:(void *)notifyData];
     }else if(!strcmp(target, "_self") || !strcmp(target, "_current") || !strcmp(target, "_parent") || !strcmp(target, "_top")){
-        newURL = [NSURL URLWithString:[NSString stringWithCString:url]];
-        dataSource = [[[IFWebDataSource alloc] initWithURL:newURL] autorelease];
-        webView = [self findSuperview:@"IFWebView"];
-        webController = [webView controller];
-        [[webController mainFrame] setProvisionalDataSource:dataSource];
-        [[webController mainFrame] startLoading];
+        if(webController){
+            newURL = [NSURL URLWithString:[NSString stringWithCString:url]];
+            dataSource = [[[IFWebDataSource alloc] initWithURL:newURL] autorelease];
+            [[webController mainFrame] setProvisionalDataSource:dataSource];
+            [[webController mainFrame] startLoading];
+        }
     }else if(!strcmp(target, "_blank") || !strcmp(target, "_new")){
         printf("Error: No API to open new browser window\n");
     }
@@ -574,7 +573,13 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 -(void)status:(const char *)message
 {
-    KWQDebug("NPN_Status\n");
+    IFWebDataSource *dataSource;
+    
+    KWQDebug("NPN_Status: %s\n", message);
+    if(webController){
+        dataSource = [[webController mainFrame] dataSource];
+        [webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
+    }
 }
 
 -(NPError)getValue:(NPNVariable)variable value:(void *)value

-- 
WebKit Debian packaging