[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 233ca338178e738aa660936227af70bc10c907d8
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 8 17:51:43 2002 +0000

    	Minor plug-in code clean-up.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView sendActivateEvent:]):
            (-[WebBaseNetscapePluginView sendUpdateEvent]):
            (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream receivedData:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c8edef9..57ea189 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-10-08  Chris Blumenberg  <cblu at apple.com>
 
+	Minor plug-in code clean-up.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView sendActivateEvent:]):
+        (-[WebBaseNetscapePluginView sendUpdateEvent]):
+        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:]):
+
+2002-10-08  Chris Blumenberg  <cblu at apple.com>
+
 	Partial fix for 2967073 - should open all TEXT type files, at least
 
         * WebView.subproj/WebControllerPrivate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c8edef9..57ea189 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-10-08  Chris Blumenberg  <cblu at apple.com>
 
+	Minor plug-in code clean-up.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView sendActivateEvent:]):
+        (-[WebBaseNetscapePluginView sendUpdateEvent]):
+        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:]):
+
+2002-10-08  Chris Blumenberg  <cblu at apple.com>
+
 	Partial fix for 2967073 - should open all TEXT type files, at least
 
         * WebView.subproj/WebControllerPrivate.m:
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index f8df5ae..7ddde90 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -143,7 +143,7 @@
     BOOL acceptedEvent;
     acceptedEvent = [self sendEvent:&event]; 
     
-    LOG(Plugins, "NPP_HandleEvent(activateEvent): %d  isActive: %d", acceptedEvent, (event.modifiers & activeFlag));
+    LOG(Plugins, "NPP_HandleEvent(activateEvent): %d  isActive: %d", acceptedEvent, activate);
 }
 
 - (BOOL)sendUpdateEvent
@@ -156,7 +156,7 @@
     event.message = (UInt32)windowRef;
 
     BOOL acceptedEvent = [self sendEvent:&event]; 
-    
+
     LOG(Plugins, "NPP_HandleEvent(updateEvt): %d", acceptedEvent);
     
     return acceptedEvent;
@@ -800,6 +800,7 @@
             [dataSource release];
         }
     }
+    
     return NPERR_NO_ERROR;
 }
 
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 12795e7..ba14403 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -125,21 +125,17 @@
         [URLString getCString:cURL];
 
         NSNumber *timeInterval = nil;
-        uint32 lastModified;
+        uint32 lastModified = 0;
         
         if ([response isKindOfClass:[WebHTTPResourceResponse class]]) {
             timeInterval = [[(WebHTTPResourceResponse *)response headers] objectForKey:@"Last-Modified"];
-        }
-
-        if(timeInterval){
-            NSTimeInterval lastModifiedInterval = [[NSDate dateWithTimeIntervalSinceReferenceDate:[timeInterval doubleValue]] timeIntervalSince1970];
-            if(lastModifiedInterval < 0){
-                lastModified = 0;
-            }else{
-                lastModified = (uint32)lastModifiedInterval;
+            if(timeInterval){
+                NSTimeInterval lastModifiedInterval;
+                lastModifiedInterval = [[NSDate dateWithTimeIntervalSinceReferenceDate:[timeInterval doubleValue]] timeIntervalSince1970];
+                if(lastModifiedInterval > 0){
+                    lastModified = (uint32)lastModifiedInterval;
+                }
             }
-        }else{
-            lastModified = 0;
         }
         
         npStream.ndata = self;

-- 
WebKit Debian packaging