adium 5059:01dc7cd1cf26: Fix the editing events sheet for ARC.
commits at adium.im
commits at adium.im
Wed Sep 12 16:30:53 UTC 2012
details: http://hg.adium.im/adium/rev/01dc7cd1cf26
revision: 5059:01dc7cd1cf26
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Sep 12 18:30:00 2012 +0200
Fix the editing events sheet for ARC.
diffs (40 lines):
diff -r 1b3f8d0c1663 -r 01dc7cd1cf26 Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m
--- a/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Wed Sep 12 14:21:00 2012 +0200
+++ b/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Wed Sep 12 18:30:00 2012 +0200
@@ -63,15 +63,7 @@
configureForGlobal:inConfigureForGlobal
defaultEventID:inDefaultEventID];
- if (parentWindow) {
- [NSApp beginSheet:[newController window]
- modalForWindow:parentWindow
- modalDelegate:newController
- didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
- contextInfo:nil];
- } else {
- [newController showWindow:nil];
- }
+ [newController showOnWindow:parentWindow];
return newController;
}
@@ -155,15 +147,17 @@
// Window is closing
- (void)windowWillClose:(id)sender
{
+ [self cleanUpDetailsPane];
+
[super windowWillClose:sender];
- [self cleanUpDetailsPane];
}
// Called as the user list edit sheet closes, dismisses the sheet
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
- [sheet orderOut:nil];
[self cleanUpDetailsPane];
+
+ [super sheetDidEnd:sheet returnCode:returnCode contextInfo:contextInfo];
}
#pragma mark Buttons
More information about the commits
mailing list