[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:46:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 86765005a2456a9d1804429dde1b24cb8f61b2fb
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 3 00:37:05 2002 +0000
- Added "remember my password" checkbox (underlying feature not
yet implemented).
- Fixed a bug that caused a crash when cancelling the auth sheet.
* Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Added
"remember this password" checkbox.
* Panels.subproj/WebAuthenticationPanel.h:
* Panels.subproj/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel cancel:]): Make sure the panel gets
retained a bit longer, so the cleanup that happens after this
message is sent can use the panel object.
(-[WebAuthenticationPanel logIn:]): Make sure the panel gets
retained a bit longer, so the cleanup that happens after this
message is sent can use the panel object.
(-[WebAuthenticationPanel runAsModalDialogWithRequest:]): Pass
proper remembered value with credential.
(-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
Pass proper remembered value with credential.
* WebKit.pbproj/project.pbxproj: Project Builder had its way with
this file.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2233 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 363cbb2..5e6dd50 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,27 @@
+2002-10-02 Maciej Stachowiak <mjs at apple.com>
+
+ - Added "remember my password" checkbox (underlying feature not
+ yet implemented).
+
+ - Fixed a bug that caused a crash when cancelling the auth sheet.
+
+ * Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Added
+ "remember this password" checkbox.
+ * Panels.subproj/WebAuthenticationPanel.h:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel cancel:]): Make sure the panel gets
+ retained a bit longer, so the cleanup that happens after this
+ message is sent can use the panel object.
+ (-[WebAuthenticationPanel logIn:]): Make sure the panel gets
+ retained a bit longer, so the cleanup that happens after this
+ message is sent can use the panel object.
+ (-[WebAuthenticationPanel runAsModalDialogWithRequest:]): Pass
+ proper remembered value with credential.
+ (-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
+ Pass proper remembered value with credential.
+ * WebKit.pbproj/project.pbxproj: Project Builder had its way with
+ this file.
+
2002-10-02 Darin Adler <darin at apple.com>
Machinery so we can handle mouseover feedback at the browser level.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 363cbb2..5e6dd50 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,27 @@
+2002-10-02 Maciej Stachowiak <mjs at apple.com>
+
+ - Added "remember my password" checkbox (underlying feature not
+ yet implemented).
+
+ - Fixed a bug that caused a crash when cancelling the auth sheet.
+
+ * Panels.subproj/English.lproj/WebAuthenticationPanel.nib: Added
+ "remember this password" checkbox.
+ * Panels.subproj/WebAuthenticationPanel.h:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel cancel:]): Make sure the panel gets
+ retained a bit longer, so the cleanup that happens after this
+ message is sent can use the panel object.
+ (-[WebAuthenticationPanel logIn:]): Make sure the panel gets
+ retained a bit longer, so the cleanup that happens after this
+ message is sent can use the panel object.
+ (-[WebAuthenticationPanel runAsModalDialogWithRequest:]): Pass
+ proper remembered value with credential.
+ (-[WebAuthenticationPanel sheetDidEnd:returnCode:contextInfo:]):
+ Pass proper remembered value with credential.
+ * WebKit.pbproj/project.pbxproj: Project Builder had its way with
+ this file.
+
2002-10-02 Darin Adler <darin at apple.com>
Machinery so we can handle mouseover feedback at the browser level.
diff --git a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
index cc06ca2..e01e9a7 100644
--- a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
+++ b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
@@ -10,6 +10,7 @@
mainLabel = id;
panel = id;
password = id;
+ remember = id;
smallLabel = id;
username = id;
};
diff --git a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
index 5b2bbe0..7904dfe 100644
--- a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
+++ b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
@@ -5,12 +5,12 @@
<key>IBDocumentLocation</key>
<string>194 447 356 240 0 0 1024 746 </string>
<key>IBFramework Version</key>
- <string>273.0</string>
+ <string>283.0</string>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>6C31</string>
+ <string>6D52</string>
</dict>
</plist>
diff --git a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib
index 4c05ed0..ff0a18c 100644
Binary files a/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib and b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib differ
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.h b/WebKit/Panels.subproj/WebAuthenticationPanel.h
index 8643eb8..7aa6aa1 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.h
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.h
@@ -15,6 +15,7 @@
IBOutlet id smallLabel;
IBOutlet id username;
IBOutlet id imageView;
+ IBOutlet id remember;
BOOL nibLoaded;
BOOL usingSheet;
id callback;
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index ee72ea3..417e691 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -38,6 +38,12 @@
- (IBAction)cancel:(id)sender
{
+ // This is required because the body of this method is going to
+ // remove all of the panel's remaining refs, which can cause a
+ // crash later when finishing button hit tracking. So we make
+ // sure it lives on a bit longer.
+ [[panel retain] autorelease];
+
[panel close];
if (usingSheet) {
[[NSApplication sharedApplication] endSheet:panel returnCode:1];
@@ -48,6 +54,12 @@
- (IBAction)logIn:(id)sender
{
+ // This is required because the body of this method is going to
+ // remove all of the panel's remaining refs, which can cause a
+ // crash later when finishing button hit tracking. So we make
+ // sure it lives on a bit longer.
+ [[panel retain] autorelease];
+
[panel close];
if (usingSheet) {
[[NSApplication sharedApplication] endSheet:panel returnCode:0];
@@ -108,7 +120,7 @@
WebCredential *credential = nil;
if ([[NSApplication sharedApplication] runModalForWindow:panel] == 0) {
- credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:NO];
+ credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:[remember state] == NSOnState];
}
[callback performSelector:selector withObject:req withObject:credential];
@@ -135,7 +147,7 @@
ASSERT(request != nil);
if (returnCode == 0) {
- credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:NO];
+ credential = [WebCredential credentialWithUsername:[username stringValue] password:[password stringValue] remembered:[remember state] == NSOnState];
}
// We take this tricky approach to nilling out and releasing the request,
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 5478257..0dbfb1b 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
- hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list