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

[darin]

The following commit has been merged in the debian/unstable branch:
commit a55967402993cc06ebd41dc32086333a2777b8f4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 2 21:45:14 2002 +0000

    WebKit:
    
            * Plugins.subproj/IFPluginView.mm:
            (-[IFPluginView setWindow]), (-[IFPluginView start]), (-[IFPluginView stop]):
    	Fix unused variable issue that affects deployment builds.
    
    WebBrowser:
    
            * LocationChangeHandler.m: Improve comments.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1427131..bfa813d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-02  Darin Adler  <darin at apple.com>
+
+        * Plugins.subproj/IFPluginView.mm:
+        (-[IFPluginView setWindow]), (-[IFPluginView start]), (-[IFPluginView stop]):
+	Fix unused variable issue that affects deployment builds.
+
 2002-07-02  John Sullivan  <sullivan at apple.com>
 
 	Remove unnecessary code to fill with white from here; this code
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1427131..bfa813d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-02  Darin Adler  <darin at apple.com>
+
+        * Plugins.subproj/IFPluginView.mm:
+        (-[IFPluginView setWindow]), (-[IFPluginView start]), (-[IFPluginView stop]):
+	Fix unused variable issue that affects deployment builds.
+
 2002-07-02  John Sullivan  <sullivan at apple.com>
 
 	Remove unnecessary code to fill with white from here; this code
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 0af49ee..bb6a295 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -400,7 +400,10 @@ static char *newCString(NSString *string)
 {
     [self setUpWindowAndPort];
 
-    NPError npErr = NPP_SetWindow(instance, &window);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_SetWindow(instance, &window);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
 
 #if 0
@@ -415,7 +418,6 @@ static char *newCString(NSString *string)
 
 -(void)start
 {
-    NPError npErr;
     NSNotificationCenter *notificationCenter;
     NSWindow *theWindow;
     IFPluginStream *stream;
@@ -425,7 +427,10 @@ static char *newCString(NSString *string)
     
     isStarted = YES;
     
-    npErr = NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_New: %d\n", npErr);
     
     // Create a WindowRef is one doesn't already exist
@@ -474,8 +479,6 @@ static char *newCString(NSString *string)
 
 - (void)stop
 {
-    NPError npErr;
-    
     if (!isStarted)
         return;
     isStarted = NO;
@@ -500,7 +503,10 @@ static char *newCString(NSString *string)
     [webFrame release];
     [webDataSource release];    
     
-    npErr = NPP_Destroy(instance, NULL);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_Destroy(instance, NULL);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
 }
 
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 0af49ee..bb6a295 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -400,7 +400,10 @@ static char *newCString(NSString *string)
 {
     [self setUpWindowAndPort];
 
-    NPError npErr = NPP_SetWindow(instance, &window);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_SetWindow(instance, &window);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
 
 #if 0
@@ -415,7 +418,6 @@ static char *newCString(NSString *string)
 
 -(void)start
 {
-    NPError npErr;
     NSNotificationCenter *notificationCenter;
     NSWindow *theWindow;
     IFPluginStream *stream;
@@ -425,7 +427,10 @@ static char *newCString(NSString *string)
     
     isStarted = YES;
     
-    npErr = NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_New: %d\n", npErr);
     
     // Create a WindowRef is one doesn't already exist
@@ -474,8 +479,6 @@ static char *newCString(NSString *string)
 
 - (void)stop
 {
-    NPError npErr;
-    
     if (!isStarted)
         return;
     isStarted = NO;
@@ -500,7 +503,10 @@ static char *newCString(NSString *string)
     [webFrame release];
     [webDataSource release];    
     
-    npErr = NPP_Destroy(instance, NULL);
+#ifndef NDEBUG
+    NPError npErr =
+#endif
+    NPP_Destroy(instance, NULL);
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
 }
 

-- 
WebKit Debian packaging