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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 39601e80c8c6f428fe9ac76109244370d34784e4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 18 22:57:19 2002 +0000

    Fixed warning.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@637 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 2be1d1d..4d17a9a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -214,7 +214,6 @@
 				394460A1020F50ED0ECA1767,
 				394460A2020F50ED0ECA1767,
 				394460A3020F50ED0ECA1767,
-				394460A4020F50ED0ECA1767,
 				394460A5020F50ED0ECA1767,
 				394460A6020F50ED0ECA1767,
 				394460A7020F50ED0ECA1767,
@@ -224,6 +223,7 @@
 				F5EBC45902134BC301CA1520,
 				F5EBC45A02134BC301CA1520,
 				9CF0E24C021361B10ECA16EA,
+				F584CFE70221BDB601A80181,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -634,12 +634,6 @@
 			path = WebView.subproj/IFWebFrame.h;
 			refType = 4;
 		};
-		39446075020F50ED0ECA1767 = {
-			isa = PBXFileReference;
-			name = IFWebFrame.m;
-			path = WebView.subproj/IFWebFrame.m;
-			refType = 4;
-		};
 		39446076020F50ED0ECA1767 = {
 			isa = PBXFileReference;
 			name = IFWebView.h;
@@ -867,12 +861,6 @@
 			settings = {
 			};
 		};
-		394460A4020F50ED0ECA1767 = {
-			fileRef = 39446075020F50ED0ECA1767;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		394460A5020F50ED0ECA1767 = {
 			fileRef = 39446077020F50ED0ECA1767;
 			isa = PBXBuildFile;
@@ -935,13 +923,13 @@
 				39446072020F50ED0ECA1767,
 				39446073020F50ED0ECA1767,
 				39446074020F50ED0ECA1767,
-				39446075020F50ED0ECA1767,
 				39446076020F50ED0ECA1767,
 				39446077020F50ED0ECA1767,
 				39446078020F50ED0ECA1767,
 				39446079020F50ED0ECA1767,
 				9CF0E249021361B00ECA16EA,
 				9CF0E24A021361B00ECA16EA,
+				F584CFE60221BDB601A80181,
 			);
 			isa = PBXGroup;
 			name = WebView;
@@ -981,6 +969,18 @@
 //F52
 //F53
 //F54
+		F584CFE60221BDB601A80181 = {
+			isa = PBXFileReference;
+			name = IFWebFrame.mm;
+			path = WebView.subproj/IFWebFrame.mm;
+			refType = 2;
+		};
+		F584CFE70221BDB601A80181 = {
+			fileRef = F584CFE60221BDB601A80181;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F5EBC45202134BB601CA1520 = {
 			children = (
 				F5EBC45302134BC301CA1520,
diff --git a/WebKit/WebView.subproj/IFWebFrame.m b/WebKit/WebView.subproj/IFWebFrame.mm
similarity index 95%
copy from WebKit/WebView.subproj/IFWebFrame.m
copy to WebKit/WebView.subproj/IFWebFrame.mm
index 6da8a4f..b5fb5c9 100644
--- a/WebKit/WebView.subproj/IFWebFrame.m
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -7,6 +7,7 @@
 
 #import <WebKit/IFWebFrame.h>
 #import <WebKit/IFWebFramePrivate.h>
+#import <WebKit/IFWebViewPrivate.h>
 #import <WebKit/IFWebDataSource.h>
 
 @implementation IFWebFrame
@@ -22,7 +23,7 @@
 
     [super init];
     
-    _framePrivate = [[IFWebFramePrivate alloc] init];
+    _framePrivate = [[IFWebFramePrivate alloc] init];   
     
     data = (IFWebFramePrivate *)_framePrivate;
     
diff --git a/WebKit/WebView.subproj/IFWebFrame.m b/WebKit/WebView.subproj/WebFrame.m
similarity index 95%
rename from WebKit/WebView.subproj/IFWebFrame.m
rename to WebKit/WebView.subproj/WebFrame.m
index 6da8a4f..b5fb5c9 100644
--- a/WebKit/WebView.subproj/IFWebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -7,6 +7,7 @@
 
 #import <WebKit/IFWebFrame.h>
 #import <WebKit/IFWebFramePrivate.h>
+#import <WebKit/IFWebViewPrivate.h>
 #import <WebKit/IFWebDataSource.h>
 
 @implementation IFWebFrame
@@ -22,7 +23,7 @@
 
     [super init];
     
-    _framePrivate = [[IFWebFramePrivate alloc] init];
+    _framePrivate = [[IFWebFramePrivate alloc] init];   
     
     data = (IFWebFramePrivate *)_framePrivate;
     

-- 
WebKit Debian packaging