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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 69f1f9a7816bc209208f216628fb6f960eaec940
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 10 18:57:45 2002 +0000

            * WebView.subproj/IFGrabBag.h: Removed.
            * WebView.subproj/IFWebController.h: Move IFContextMenuHandler
    	here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 269e283..b04a98d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-10  Maciej Stachowiak  <mjs at apple.com>
+
+        * WebView.subproj/IFGrabBag.h: Removed.
+        * WebView.subproj/IFWebController.h: Move IFContextMenuHandler
+	here.
+
 2002-07-10  Darin Adler  <darin at apple.com>
 
 	Did some tweaks that weren't really necessary. But at least one is a significant
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 269e283..b04a98d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-10  Maciej Stachowiak  <mjs at apple.com>
+
+        * WebView.subproj/IFGrabBag.h: Removed.
+        * WebView.subproj/IFWebController.h: Move IFContextMenuHandler
+	here.
+
 2002-07-10  Darin Adler  <darin at apple.com>
 
 	Did some tweaks that weren't really necessary. But at least one is a significant
diff --git a/WebKit/WebView.subproj/IFGrabBag.h b/WebKit/WebView.subproj/IFGrabBag.h
deleted file mode 100644
index 6f13d97..0000000
--- a/WebKit/WebView.subproj/IFGrabBag.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	
-        IFWebController.h
-	Copyright 2001, Apple, Inc. All rights reserved.
-
-        Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#ifdef READY_FOR_PRIMETIME
-
-
-
-/*
-   ============================================================================= 
-*/
- at protocol IFContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
- at end
-
-
-
-#endif
-
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 1dca8fe..3f2711b 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -98,6 +98,20 @@
 
 @end
 
+
+#ifdef READY_FOR_PRIME_TIME
+/*
+   ============================================================================= 
+*/
+ at protocol IFContextMenuHandler
+// Returns the array of menu items for this node that will be displayed in the context menu.
+// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
+// after making any desired changes or additions.
+- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
+ at end
+#endif
+
+
 /*
    ============================================================================= 
 
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 1dca8fe..3f2711b 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -98,6 +98,20 @@
 
 @end
 
+
+#ifdef READY_FOR_PRIME_TIME
+/*
+   ============================================================================= 
+*/
+ at protocol IFContextMenuHandler
+// Returns the array of menu items for this node that will be displayed in the context menu.
+// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
+// after making any desired changes or additions.
+- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
+ at end
+#endif
+
+
 /*
    ============================================================================= 
 
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 1dca8fe..3f2711b 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -98,6 +98,20 @@
 
 @end
 
+
+#ifdef READY_FOR_PRIME_TIME
+/*
+   ============================================================================= 
+*/
+ at protocol IFContextMenuHandler
+// Returns the array of menu items for this node that will be displayed in the context menu.
+// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
+// after making any desired changes or additions.
+- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
+ at end
+#endif
+
+
 /*
    ============================================================================= 
 

-- 
WebKit Debian packaging