[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 886db23d6253c6fb28b1b697ed69dcd0471c6b62
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 21 04:59:14 2002 +0000

            * WebKit.pbproj/project.pbxproj: Turn stricter warnings back on now that we
    	don't use C++ any more.
    
            * Plugins.subproj/WebPluginView.m:
            (-[WebPluginView sendActivateEvent:]): Fix cast that stricter warning didn't like.
            (-[WebPluginView sendUpdateEvent]): Fix cast that stricter warning didn't like.
            (-[WebPluginView frameStateChanged:]): Remove unneeded cast that stricter warning didn't like.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 25e627d..8dfdc5c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-07-20  Darin Adler  <darin at apple.com>
 
+        * WebKit.pbproj/project.pbxproj: Turn stricter warnings back on now that we
+	don't use C++ any more.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView sendActivateEvent:]): Fix cast that stricter warning didn't like.
+        (-[WebPluginView sendUpdateEvent]): Fix cast that stricter warning didn't like.
+        (-[WebPluginView frameStateChanged:]): Remove unneeded cast that stricter warning didn't like.
+
+2002-07-20  Darin Adler  <darin at apple.com>
+
 	- fixed 2999643 -- Leak of NSSet in -[IFStandardPanels _didStartLoadingURL:inController:]
 
 	This is another case of the leak I fixed a month ago. I don't know how I managed to
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 25e627d..8dfdc5c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-07-20  Darin Adler  <darin at apple.com>
 
+        * WebKit.pbproj/project.pbxproj: Turn stricter warnings back on now that we
+	don't use C++ any more.
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView sendActivateEvent:]): Fix cast that stricter warning didn't like.
+        (-[WebPluginView sendUpdateEvent]): Fix cast that stricter warning didn't like.
+        (-[WebPluginView frameStateChanged:]): Remove unneeded cast that stricter warning didn't like.
+
+2002-07-20  Darin Adler  <darin at apple.com>
+
 	- fixed 2999643 -- Leak of NSSet in -[IFStandardPanels _didStartLoadingURL:inController:]
 
 	This is another case of the leak I fixed a month ago. I don't know how I managed to
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index f8a5fef..4897885 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -112,7 +112,8 @@
     
     [self getCarbonEvent:&event];
     event.what = activateEvt;
-    event.message = (UInt32)[[self window] _windowRef];
+    WindowRef windowRef = [[self window] _windowRef];
+    event.message = (UInt32)windowRef;
     if (activate)
         event.modifiers |= activMask;
     
@@ -128,7 +129,8 @@
     
     [self getCarbonEvent:&event];
     event.what = updateEvt;
-    event.message = (UInt32)[[self window] _windowRef];
+    WindowRef windowRef = [[self window] _windowRef];
+    event.message = (UInt32)windowRef;
 
     acceptedEvent = NPP_HandleEvent(instance, &event); 
     
@@ -681,8 +683,8 @@
         return;
     
     notifyData = [notifyDataValue pointerValue];
-    frameState = (WebFrameState)[[[notification userInfo] objectForKey:WebCurrentFrameState] intValue];
-    if(frameState == WebFrameStateComplete){
+    frameState = [[[notification userInfo] objectForKey:WebCurrentFrameState] intValue];
+    if (frameState == WebFrameStateComplete) {
         NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
     }
     //FIXME: Need to send other NPReasons
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index b6ce7ba..1dcfe7e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -146,9 +146,7 @@
 				PRODUCT_NAME = WebKit;
 				SECTORDER_FLAGS = "";
 				USE_GCC3_PFE_SUPPORT = YES;
-				WARNING_CFLAGS = "$(WARNING_COMMONFLAGS)";
-				WARNING_COMMONFLAGS = "-Werror -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wmissing-prototypes -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
-				WARNING_CPLUSPLUSFLAGS = "$(WARNING_COMMONFLAGS)";
+				WARNING_CFLAGS = "-Werror -Wall -W -Wbad-function-cast -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter";
 				WRAPPER_EXTENSION = framework;
 			};
 			dependencies = (

-- 
WebKit Debian packaging