Permalink
Browse files

couple small more things

  • Loading branch information...
1 parent cb931b7 commit 45010390b6623b8d47bc2a3d8425c5c7cfa54711 @elasticthreads elasticthreads committed Apr 5, 2013
Showing with 3 additions and 9 deletions.
  1. +1 −1 AppController.h
  2. +0 −2 AppController.m
  3. +0 −2 LinkingEditor.m
  4. +1 −1 StatusItemView.m
  5. +0 −1 TagEditingManager.h
  6. +1 −2 WALController.m
View
@@ -234,9 +234,9 @@ void outletObjectAwoke(id sender);
- (void)relaunchNV:(id)sender;
- (void)reactivateAfterDelay;
- (void)reActivate:(id)sender;
-- (NSArray *)referenceLinksInString:(NSString *)contentString;
//- (IBAction)testThing:(id)sender;
- (void)setUpStatusBarItem;
+- (NSArray *)referenceLinksInString:(NSString *)contentString;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
- (void)postToggleToolbar:(NSNumber *)boolNum;
#endif
View
@@ -737,7 +737,6 @@ - (void)_forceRegeneratePreviewsForTitleColumn {
- (void)_configureDividerForCurrentLayout {
-
self.isEditing = NO;
BOOL horiz = [prefsController horizontalLayout];
if ([notesSubview isCollapsed]) {
@@ -2372,7 +2371,6 @@ - (void)toggleAttachedWindow:(NSNotification *)aNotification
- (void)toggleAttachedMenu:(NSNotification *)aNotification
{
[statusItem popUpStatusItemMenu:statBarMenu];
-
}
View
@@ -84,8 +84,6 @@ - (void)awakeFromNib {
@selector(setMakeURLsClickable:sender:),
@selector(setSearchTermHighlightColor:sender:),
@selector(setShouldHighlightSearchTerms:sender:),
- @selector(setMaxNoteBodyWidth:sender:),
- @selector(setManagesTextWidthInWindow:sender:), nil];
// @selector(setBackgroundTextColor:sender:),
// @selector(setForegroundTextColor:sender:),
View
@@ -16,7 +16,7 @@ @implementation StatusItemView
- (id)initWithFrame:(NSRect)frame controller:(AppController *)ctrlr
{
- if (self == [super initWithFrame:frame]) {
+ if (self = [super initWithFrame:frame]) {
controller = ctrlr; // deliberately weak reference.
}
return self;
View
@@ -16,7 +16,6 @@
}
- (void)awakeFromNib;
-- (void)controlTextDidChange:(NSNotification *)aNotification;
- (NSString *)newMultinoteLabels;
- (void)setTF:(NSString *)inString;
- (void)popTP:(id)sender;
View
@@ -40,15 +40,14 @@ @implementation WALController
- (id)initWithParentFSRep:(const char*)path encryptionKey:(NSData*)key {
if ([super init]) {
logFD = -1;
-
char filename[] = "Interim Note-Changes";
size_t newPathLength = sizeof(filename) + strlen(path) + 2;
journalFile = (char*)malloc(newPathLength);
strlcpy(journalFile, path, newPathLength);
strlcat(journalFile, "/", newPathLength);
strlcat(journalFile, filename, newPathLength);
-
+
//for simplicity's sake the log file is always compressed and encrypted with the key for the current database
//if the database has no encryption, it should have passed some constant known key to us instead
logSessionKey = [key retain];

0 comments on commit 4501039

Please sign in to comment.