[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 e62bf989ee4a5c0312f44962380c8f857467c4be
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 4 22:43:31 2002 +0000

            * Panels.subproj/WebPanelCookieAcceptHandler.h: Removed.
            * Panels.subproj/WebPanelCookieAcceptHandler.m: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7fb83c4..7116c0b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-04  Darin Adler  <darin at apple.com>
+
+        * Panels.subproj/WebPanelCookieAcceptHandler.h: Removed.
+        * Panels.subproj/WebPanelCookieAcceptHandler.m: Removed.
+
 2002-10-04  Richard Williamson   <rjw at apple.com>
 
         Danger Will Robinson.  We have to poseAsClass: as early as possible
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7fb83c4..7116c0b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-10-04  Darin Adler  <darin at apple.com>
+
+        * Panels.subproj/WebPanelCookieAcceptHandler.h: Removed.
+        * Panels.subproj/WebPanelCookieAcceptHandler.m: Removed.
+
 2002-10-04  Richard Williamson   <rjw at apple.com>
 
         Danger Will Robinson.  We have to poseAsClass: as early as possible
diff --git a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h
deleted file mode 100644
index 3e2a2f3..0000000
--- a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- WebPanelAuthenticationHandler.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-#import <Foundation/Foundation.h>
-#import <WebFoundation/WebCookieManager.h>
-
- at class NSWindow;
-
- at interface WebPanelCookieAcceptHandler : NSObject  <WebCookieAcceptHandler>
-{
-    NSMutableDictionary *windowToPanel;
-    NSMutableDictionary *requestToWindow;
-}
-
-- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void  *)contextInfo;
-
-// WebCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(WebCookieAcceptRequest *)request;
--(void)startCookieAcceptCheck:(WebCookieAcceptRequest *)request;
--(void)cancelCookieAcceptCheck:(WebCookieAcceptRequest *)request;
-
- at end
diff --git a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
deleted file mode 100644
index dfee2d7..0000000
--- a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- WebPanelCookieAcceptHandler.m
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-
-#import <Cocoa/Cocoa.h>
-#import <WebKit/WebPanelCookieAcceptHandler.h>
-#import <WebKit/WebStandardPanels.h>
-#import <WebFoundation/WebNSDictionaryExtras.h>
-
-static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
-
- at implementation WebPanelCookieAcceptHandler
-
--(id)init
-{
-    self = [super init];
-    if (self != nil) {
-        windowToPanel = [[NSMutableDictionary alloc] init];
-        requestToWindow = [[NSMutableDictionary alloc] init];
-    }
-    return self;
-}
-
--(void)dealloc
-{
-    [windowToPanel release];
-    [requestToWindow release];
-    [super dealloc];
-}
-
-// WebCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(WebCookieAcceptRequest *)request
-{
-    id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
-
-    if (window == nil) {
-        window = WebModalDialogPretendWindow;
-    }
-
-    return [windowToPanel objectForKey:window] == nil;
-}
-
--(void)startCookieAcceptCheck:(WebCookieAcceptRequest *)request
-{
-    id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request URL]];
-
-    if (window == nil) {
-        window = WebModalDialogPretendWindow;
-    }
-
-    if ([windowToPanel objectForKey:window] != nil) {
-        [request cookieAcceptCheckDone:FALSE];
-        return;
-    }
-
-    NSWindow *panel;
-
-    if (window == WebModalDialogPretendWindow) {
-	if ([[request cookies] count] == 1) {
-	    panel = NSGetAlertPanel(@"Accept cookie?",
-				    @"Server \"%@\" has sent 1 cookie.",
-				    @"Accept", @"Reject", nil,
-				    [[request URL] host]);
-	} else {
-	    panel = NSGetAlertPanel(@"Accept cookies?",
-				    @"Server \"%@\" has sent %d cookies.",
-				    @"Accept", @"Reject", nil,
-				    [[request URL] host], [[request cookies] count]);
-	}
-	
-	[requestToWindow _web_setObject:window forUncopiedKey:request];
-	[windowToPanel _web_setObject:panel forUncopiedKey:window];
-	[panel release];
-	
-        [self doneWithCheck:panel returnCode:[NSApp runModalForWindow:panel] contextInfo:request];
-    } else {
-	if ([[request cookies] count] == 1) {
-	    NSBeginAlertSheet(@"Accept cookie?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent 1 cookie.", [[request URL] host]);
-	} else {
-	    NSBeginAlertSheet(@"Accept cookies?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent %d cookies.", [[request URL] host], [[request cookies] count]);
-	}
-	panel = [window attachedSheet];
-	[requestToWindow _web_setObject:window forUncopiedKey:request];
-	[windowToPanel _web_setObject:panel forUncopiedKey:window];
-    }
-}
-
--(void)cancelCookieAcceptCheck:(WebCookieAcceptRequest *)request
-{
-    id window = [requestToWindow objectForKey:request];
-    if (window != nil) {
-        NSWindow *panel = [windowToPanel objectForKey:window];
-        [panel close];
-        if (window == WebModalDialogPretendWindow) {
-            [NSApp stopModalWithCode:NSAlertAlternateReturn];
-        } else {
-            [NSApp endSheet:panel returnCode:NSAlertAlternateReturn];
-        }
-    }
-}
-
-- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void  *)contextInfo
-{
-    WebCookieAcceptRequest *request = (WebCookieAcceptRequest *)contextInfo;
-    
-    id window = [requestToWindow objectForKey:request];
-    if (window != nil) {
-        [windowToPanel removeObjectForKey:window];
-        [requestToWindow removeObjectForKey:request];
-    }
-
-    [request cookieAcceptCheckDone:(returnCode == NSAlertDefaultReturn)];
-}
-
- at end

-- 
WebKit Debian packaging