Revision: 3890
http://skim-app.svn.sourceforge.net/skim-app/?rev=3890&view=rev
Author: hofman
Date: 2008-05-18 03:29:53 -0700 (Sun, 18 May 2008)
Log Message:
-----------
Type observation contexts as void*, perhaps a pointer mismatch may cause the
crash.
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKMainWindowController.m
trunk/SKNoteWindowController.m
trunk/SKPDFView.m
trunk/SKPreferenceController.m
trunk/SKSnapshotWindowController.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKBookmarkController.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -71,7 +71,7 @@
static NSString *SKRecentDocumentAliasDataKey = @"_BDAlias";
static NSString *SKRecentDocumentSnapshotsKey = @"snapshots";
-static NSString *SKBookmarkDefaultsObservationContext =
@"SKBookmarkDefaultsObservationContext";
+static void *SKBookmarkDefaultsObservationContext = (void
*)@"SKBookmarkDefaultsObservationContext";
@implementation SKBookmarkController
@@ -778,7 +778,7 @@
NSNumber *fontSize = [[NSUserDefaults standardUserDefaults]
objectForKey:SKTableFontSizeKey];
if (fontSize)
[self setFont:[NSFont systemFontOfSize:[fontSize floatValue]]];
- [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKTableFontSizeKey context:(void *)SKBookmarkDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKTableFontSizeKey context:SKBookmarkDefaultsObservationContext];
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKMainWindowController.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -128,9 +128,9 @@
static NSString *SKMainWindowFrameAutosaveName = @"SKMainWindow";
-static NSString *SKPDFAnnotationPropertiesObservationContext =
@"SKPDFAnnotationPropertiesObservationContext";
+static void *SKPDFAnnotationPropertiesObservationContext = (void
*)@"SKPDFAnnotationPropertiesObservationContext";
-static NSString *SKMainWindowDefaultsObservationContext =
@"SKMainWindowDefaultsObservationContext";
+static void *SKMainWindowDefaultsObservationContext = (void
*)@"SKMainWindowDefaultsObservationContext";
NSString *SKLeftSidePaneWidthKey = @"SKLeftSidePaneWidth";
NSString *SKRightSidePaneWidthKey = @"SKRightSidePaneWidth";
@@ -3262,7 +3262,7 @@
SKThumbnailSizeKey,
SKSnapshotThumbnailSizeKey,
SKShouldAntiAliasKey,
SKGreekingThresholdKey,
SKTableFontSizeKey, nil]
- context:(void *)SKMainWindowDefaultsObservationContext];
+ context:SKMainWindowDefaultsObservationContext];
}
- (void)unregisterAsObserver {
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKNoteWindowController.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -52,9 +52,9 @@
static NSString *SKKeepNoteWindowsOnTopKey = @"SKKeepNoteWindowsOnTop";
-static NSString *SKNoteWindowPageObservationContext =
@"SKNoteWindowPageObservationContext";
-static NSString *SKNoteWindowBoundsObservationContext =
@"SKNoteWindowBoundsObservationContext";
-static NSString *SKNoteWindowDefaultsObservationContext =
@"SKNoteWindowDefaultsObservationContext";
+static void *SKNoteWindowPageObservationContext = (void
*)@"SKNoteWindowPageObservationContext";
+static void *SKNoteWindowBoundsObservationContext = (void
*)@"SKNoteWindowBoundsObservationContext";
+static void *SKNoteWindowDefaultsObservationContext = (void
*)@"SKNoteWindowDefaultsObservationContext";
@implementation SKNoteWindowController
@@ -100,7 +100,7 @@
[note addObserver:self forKeyPath:SKPDFAnnotationPageKey options:0
context:SKNoteWindowPageObservationContext];
[note addObserver:self forKeyPath:SKPDFAnnotationBoundsKey options:0
context:SKNoteWindowBoundsObservationContext];
- [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKeys:[NSArray arrayWithObjects:SKAnchoredNoteFontNameKey,
SKAnchoredNoteFontSizeKey, nil] context:(void
*)SKNoteWindowDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKeys:[NSArray arrayWithObjects:SKAnchoredNoteFontNameKey,
SKAnchoredNoteFontSizeKey, nil] context:SKNoteWindowDefaultsObservationContext];
}
return self;
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKPDFView.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -105,7 +105,7 @@
static NSString *SKDefaultFreeTextNoteContentsKey =
@"SKDefaultFreeTextNoteContents";
static NSString *SKDefaultAnchoredNoteContentsKey =
@"SKDefaultAnchoredNoteContents";
-static NSString *SKPDFViewDefaultsObservationContext =
@"SKPDFViewDefaultsObservationContext";
+static void *SKPDFViewDefaultsObservationContext = (void
*)@"SKPDFViewDefaultsObservationContext";
static unsigned int moveReadingBarModifiers = NSAlternateKeyMask;
static unsigned int resizeReadingBarModifiers = NSAlternateKeyMask |
NSShiftKeyMask;
@@ -251,7 +251,7 @@
name:PDFViewScaleChangedNotification object:self];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKeys:
[NSArray arrayWithObjects:SKReadingBarColorKey, SKReadingBarInvertKey,
nil]
- context:(void *)SKPDFViewDefaultsObservationContext];
+ context:SKPDFViewDefaultsObservationContext];
}
- (id)initWithFrame:(NSRect)frameRect {
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKPreferenceController.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -55,7 +55,7 @@
static NSString *SKPreferenceWindowFrameAutosaveName = @"SKPreferenceWindow";
-static NSString *SKPreferenceWindowDefaultsObservationContext =
@"SKPreferenceWindowDefaultsObservationContext";
+static void *SKPreferenceWindowDefaultsObservationContext = (void
*)@"SKPreferenceWindowDefaultsObservationContext";
@implementation SKPreferenceController
@@ -73,8 +73,8 @@
sud = [NSUserDefaults standardUserDefaults];
sudc = [NSUserDefaultsController sharedUserDefaultsController];
- [sudc addObserver:self forKey:SKDefaultPDFDisplaySettingsKey
context:(void *)SKPreferenceWindowDefaultsObservationContext];
- [sudc addObserver:self forKey:SKDefaultFullScreenPDFDisplaySettingsKey
context:(void *)SKPreferenceWindowDefaultsObservationContext];
+ [sudc addObserver:self forKey:SKDefaultPDFDisplaySettingsKey
context:SKPreferenceWindowDefaultsObservationContext];
+ [sudc addObserver:self forKey:SKDefaultFullScreenPDFDisplaySettingsKey
context:SKPreferenceWindowDefaultsObservationContext];
}
return self;
}
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2008-05-17 17:53:30 UTC (rev 3889)
+++ trunk/SKSnapshotWindowController.m 2008-05-18 10:29:53 UTC (rev 3890)
@@ -66,7 +66,7 @@
static NSString *SKSnapshotWindowFrameAutosaveName = @"SKSnapshotWindow";
static NSString *SKSnapshotViewChangedNotification =
@"SKSnapshotViewChangedNotification";
-static NSString *SKSnaphotWindowDefaultsObservationContext =
@"SKSnaphotWindowDefaultsObservationContext";
+static void *SKSnaphotWindowDefaultsObservationContext = (void
*)@"SKSnaphotWindowDefaultsObservationContext";
@implementation SKSnapshotWindowController
@@ -84,7 +84,7 @@
BOOL keepOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKSnapshotsOnTopKey];
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel :
NSNormalWindowLevel];
[[self window] setHidesOnDeactivate:keepOnTop || forceOnTop];
- [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKSnapshotsOnTopKey context:(void
*)SKSnaphotWindowDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKSnapshotsOnTopKey context:SKSnaphotWindowDefaultsObservationContext];
}
- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
