Get things compilin'.

FTPFS/FTPFSDelegate.m

@@ -63,7 +63,7 @@ - (NSArray *)taskArgumentsForParameters:(NSDictionary *)parameters {
 
 - (NSDictionary *)taskEnvironmentForParameters:(NSDictionary *)params {
 	NSMutableDictionary* env = [NSMutableDictionary dictionaryWithDictionary:[[NSProcessInfo processInfo] environment]];
-	[env setObject:mfsecTokenForFilesystemWithUUID([params objectForKey:KMFFSUUIDParameter]) forKey:@"FTPFS_TOKEN"];
+	[env setObject:mfsecTokenForFilesystemWithUUID([params objectForKey:kMFFSUUIDParameter]) forKey:@"FTPFS_TOKEN"];
 	[env setObject:[self askpassPath] forKey:@"FTPFS_ASKPASS"];
 
 	return [env copy];

MFClient.m

@@ -349,7 +349,7 @@ - (MFClientFS *)filesystemWithUUID:(NSString *)uuid {
 }
 
 - (MFClientPlugin *)pluginWithID:(NSString *)anID {
-	NSAssert(id, @"id nil when requesting plugin in MFClient");
+	NSAssert(anID, @"id nil when requesting plugin in MFClient");
 	return [pluginsDictionary objectForKey:anID];
 }
 

MFCommunicationServer.m

@@ -43,13 +43,13 @@ - (void)registerNotifications {
 
 	[[MFFilesystemController sharedController] addObserver:self forKeyPath:@"filesystems" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
 	[[MFFilesystemController sharedController] addObserver:self forKeyPath:@"plugins" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
-	[[MFFilesystemController sharedController] addObserver:self forKeyPath:@"recents" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];w
+	[[MFFilesystemController sharedController] addObserver:self forKeyPath:@"recents" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
 }
 
 - (id) init {
 	self = [super init];
 	if (self != nil) {
-		clients = [NSMutableArray array];
+		_clients = [NSMutableArray array];
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleConnectionDidDie:) name:NSConnectionDidDieNotification object:nil];
 	}
 
@@ -70,12 +70,12 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 	if ([keyPath isEqualToString:@"status"] && [object isKindOfClass:[MFFilesystem class]]
 		&& ![[change objectForKey:NSKeyValueChangeOldKey] isEqualToString:[change objectForKey:NSKeyValueChangeNewKey]]) {
 		MFFilesystem *fs = (MFFilesystem *)object;
-		[clients makeObjectsPerformSelector:@selector(noteStatusChangedForFSWithUUID:) withObject:fs.uuid];
+		[_clients makeObjectsPerformSelector:@selector(noteStatusChangedForFSWithUUID:) withObject:fs.uuid];
 	}
 
 	if ([keyPath isEqualToString:@"parameters"] && [object isKindOfClass:[MFFilesystem class]]) {
 		MFFilesystem *fs = (MFFilesystem*)object;
-		[clients makeObjectsPerformSelector:@selector(noteParametersChangedForFSWithUUID:) withObject:fs.uuid];
+		[_clients makeObjectsPerformSelector:@selector(noteParametersChangedForFSWithUUID:) withObject:fs.uuid];
 	}
 
 	if ([keyPath isEqualToString:@"filesystems"] && object == [MFFilesystemController sharedController]) {
@@ -84,15 +84,15 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 			for (MFServerFS *fs in [change objectForKey:NSKeyValueChangeNewKey]) {
 				[fs addObserver:self forKeyPath:@"status" options:NSKeyValueObservingOptionNew context:nil];
 				[fs addObserver:self forKeyPath:@"parameters" options:NSKeyValueObservingOptionNew context:nil];
-				[clients makeObjectsPerformSelector:@selector(noteFilesystemAddedWithUUID:) withObject:[fs uuid]];
+				[_clients makeObjectsPerformSelector:@selector(noteFilesystemAddedWithUUID:) withObject:[fs uuid]];
 			}
 		}
 
 		if(changeKind == NSKeyValueChangeRemoval) {
 			for(MFServerFS *fs in [change objectForKey:NSKeyValueChangeOldKey]) {
 				[fs removeObserver:self forKeyPath:@"status"];
 				[fs removeObserver:self forKeyPath:@"parameters"];
-				[clients makeObjectsPerformSelector:@selector(noteFilesystemRemovedWithUUID:) withObject:[fs uuid]];
+				[_clients makeObjectsPerformSelector:@selector(noteFilesystemRemovedWithUUID:) withObject:[fs uuid]];
 			}
 		}
 	}
@@ -102,7 +102,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 		if (changeKind == NSKeyValueChangeInsertion) {
 			NSArray *newRecents = [change objectForKey:NSKeyValueChangeNewKey];
 			for(NSDictionary *recentsDict in newRecents) {
-				[clients makeObjectsPerformSelector:@selector(noteRecentAdded:) withObject:recentsDict];
+				[_clients makeObjectsPerformSelector:@selector(noteRecentAdded:) withObject:recentsDict];
 			 }
 		}
 	}
@@ -153,7 +153,7 @@ - (MFServerFS *)quickMountWithURL:(NSURL *)url {
 	NSError *error;
 	MFServerFS *fs = [[MFFilesystemController sharedController] quickMountWithURL:url error:&error];
 	if (error) {
-		recentError = error;
+		_recentError = error;
 	}
 	return fs;
 }
@@ -199,13 +199,13 @@ - (void)registerClient:(id <MFClientProtocol>) client {
 
 - (void)unregisterClient:(id <MFClientProtocol>) client {
 	NSAssert([client conformsToProtocol:@protocol(MFClientProtocol)], @"Client doesn't conform to protocol, unregisterClient");
-	NSAssert([clients containsObject:client], @"Client not registered, unregisterClient");
+	NSAssert([_clients containsObject:client], @"Client not registered, unregisterClient");
 	[_clients removeObject:client];
 }
 
 - (void)handleConnectionDidDie:(NSNotification *)note {
 	// NSLog(@"Connection did die on server! %@ object %@ userInfo %@", note, [note object], [note userInfo]);
-	for(id obj in clients) {
+	for(id obj in _clients) {
 		if ([obj connectionForProxy] == [note object]) {
 			// NSLog(@"Killing %@", obj);
 			[_clients removeObject:obj];
@@ -220,7 +220,7 @@ - (NSString *)agentBundlePath {
 # pragma mark Logging
 - (void)sendASLMessageDict:(NSDictionary *)messageDict {
 	@try {
-		[clients makeObjectsPerformSelector:@selector(recordASLMessageDict:) withObject:messageDict];
+		[_clients makeObjectsPerformSelector:@selector(recordASLMessageDict:) withObject:messageDict];
 	}
 	@catch (NSException* e) {
 		return;

MFEditingController.h

@@ -24,7 +24,7 @@
 
 @class MFClientFS;
 
-@interface MFEditingController : NSWindowController {
+@interface MFEditingController : NSWindowController <NSTabViewDelegate> {
 	MFClientFS* _fsBeingEdited;
 
 }

MFFilesystemController.m

@@ -181,7 +181,7 @@ - (void)writeRecentFilesystems {
 		 }
 	 }
 
-	BOOL writeOK = [recents writeToFile: recentsPath atomically:NO];
+	BOOL writeOK = [_recents writeToFile: recentsPath atomically:NO];
 	if (!writeOK) {
 		MFLogS(self, @"Could not write recents to file!");
 	}
@@ -204,7 +204,7 @@ - (void)recordRecentFilesystem:(MFServerFS *)fs {
 	// Strip the UUID so it never repeats
 	[params setValue:nil forKey:kMFFSUUIDParameter];
 
-	for(NSDictionary *recent in recents) {
+	for(NSDictionary *recent in _recents) {
 		BOOL equal = YES;
 		for(NSString *key in [recent allKeys]) {
 			equal = ([[recent objectForKey:key] isEqual:[params objectForKey:key]]);
@@ -221,8 +221,8 @@ - (void)recordRecentFilesystem:(MFServerFS *)fs {
 	}
 
 	[[self mutableArrayValueForKey:@"recents"] addObject:params];
-	if ([recents count] > 10) {
-		[recents removeObjectAtIndex: 0];
+	if ([_recents count] > 10) {
+		[_recents removeObjectAtIndex: 0];
 	}
 	[self writeRecentFilesystems];
 }
@@ -386,7 +386,7 @@ - (void)addMountedPath:(NSString *)path {
 	NSAssert(path, @"Mounted Path nil in MFFilesystemControlled addMountedPath");
 	if (![_mountedPaths containsObject: path]) {
 		[_mountedPaths addObject:path];
-		for(MFServerFS *fs in filesystems) {
+		for(MFServerFS *fs in _filesystems) {
 			if ([fs.mountPath isEqualToString: path] && ([fs isWaiting] )) {
 				[fs handleMountNotification];
 				[self invalidateTokensForFS: fs];
@@ -404,7 +404,7 @@ - (void)removeMountedPath:(NSString *)path {
 	NSAssert(path, @"Mounted Path nil in MFFilesystemControlled removeMountedPath");
 	if ([_mountedPaths containsObject:path]) {
 		[_mountedPaths removeObject:path];
-		NSArray *matchingFilesystems = [filesystems filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"self.mountPath == %@", path]];
+		NSArray *matchingFilesystems = [_filesystems filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"self.mountPath == %@", path]];
 		[matchingFilesystems makeObjectsPerformSelector:@selector(handleUnmountNotification)];
 		[self updateFSPersistenceCache];
 

MFLogViewerController.h

@@ -20,7 +20,7 @@
 #import <Cocoa/Cocoa.h>
 @class MFLogReader, MFClientFS;
 
-@interface MFLogViewerController : NSWindowController {
+@interface MFLogViewerController : NSWindowController <NSMenuDelegate> {
 	IBOutlet NSTableView *logTableView;
 	IBOutlet NSArrayController *logArrayController;
 	IBOutlet NSPopUpButton *filesystemFilterPopup;

MFLogViewerController.m

@@ -143,16 +143,16 @@ - (void)fsSelected:(id)sender {
 
 # pragma mark Search & Filter
 - (NSPredicate *)fullLogPredicate {
-	if (filterPredicate && searchPredicate) {
-		return [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, searchPredicate, nil]];
+	if (_filterPredicate && _searchPredicate) {
+		return [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:_filterPredicate, _searchPredicate, nil]];
 	}
 
-	if (filterPredicate) {
-		return filterPredicate;
+	if (_filterPredicate) {
+		return _filterPredicate;
 	}
 
-	if (searchPredicate) {
-		return searchPredicate;
+	if (_searchPredicate) {
+		return _searchPredicate;
 	}
 
 	return nil;

MFLogViewerTableView.m

@@ -40,15 +40,15 @@ - (id)initWithCoder:(NSCoder *)decoder {
 }
 
 - (int)numberOfRowsInTableView:(NSTableView *)tableView {
-	return [logMessages count];
+	return [_logMessages count];
 }
 
 - (id)tableView:(NSTableView *) tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row {
-	return [(NSDictionary *)[logMessages objectAtIndex:row] objectForKey:[NSString stringWithUTF8String:ASL_KEY_MSG]];
+	return [(NSDictionary *)[_logMessages objectAtIndex:row] objectForKey:[NSString stringWithUTF8String:ASL_KEY_MSG]];
 }
 
 - (void)tableView:(NSTableView *)tableView willDisplayCell:(NSCell *)cell forTableColumn:(NSTableColumn *)tableColumn row:(int)row {
-	[cell setRepresentedObject:[logMessages objectAtIndex:row]];
+	[cell setRepresentedObject:[_logMessages objectAtIndex:row]];
 }
 
 - (void)viewDidEndLiveResize {

MFMainController.m

@@ -58,7 +58,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 # pragma mark Opening Files
 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filePath {
 	NSDictionary *fileDict = [NSDictionary dictionaryWithContentsOfFile:filePath];
-	NSString *uuid = [fileDict objectForKey: KMFFSUUIDParameter];
+	NSString *uuid = [fileDict objectForKey:kMFFSUUIDParameter];
 	if (!uuid) {
 		MFLogS(self, @"Asked to open bad file at pah %@", filePath);
 		return NO;

MFServerFS.m

@@ -127,7 +127,7 @@ - (MFServerFS *)initWithParameters:(NSDictionary *)params plugin:(MFServerPlugin
 		statusInfo = [self initializedStatusInfo];
 		_pauseTimeout = NO;
 		if (![parameters objectForKey:kMFFSUUIDParameter]) {
-			[parameters setObject:[self getNewUUID] forKey:KMFFSUUIDParameter];
+			[parameters setObject:[self getNewUUID] forKey:kMFFSUUIDParameter];
 		}
 
 		[self registerGeneralNotifications];
@@ -354,7 +354,7 @@ - (void)mount {
 	}
 
 	MFLogS(self, @"Mounting");
-	self._pauseTimeout = NO;
+	self.pauseTimeout = NO;
 	self.status = kMFStatusFSWaiting;
 	if ([self setupMountPoint] == YES) {
 		_task = [self taskForLaunch];
@@ -421,7 +421,7 @@ - (BOOL)validateParameters:(NSDictionary*)params error:(NSError **)error
 			*error = [MFError parameterMissingErrorWithParameterName:kMFFSMountPathParameter];
 			return NO;
 		}
-		if (![impliedParams objectForKey:KMFFSUUIDParameter]) {
+		if (![impliedParams objectForKey:kMFFSUUIDParameter]) {
 			*error = [MFError parameterMissingErrorWithParameterName:kMFFSUUIDParameter];
 			return NO;
 		}
@@ -505,9 +505,9 @@ - (NSTimer *)newTimeoutTimer {
 }
 
 - (void)handleMountTimeout:(NSTimer *)theTimer {
-	if (self._pauseTimeout) {
+	if (_pauseTimeout) {
 		// MFLogS(self, @"Timeout paused");
-		timer = [self newTimeoutTimer];
+		_timer = [self newTimeoutTimer];
 		return;
 	}
 

MFServerFSProtocol.h

@@ -0,0 +1,30 @@
+//
+//  MFServerFSProtocol.h
+//  MacFusion2
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <Cocoa/Cocoa.h>
+@class MFServerPlugin;
+
+@protocol MFServerFSProtocol <NSObject>
+- (NSDictionary*)statusInfo;
+- (NSDictionary*)parameters;
+
+- (void)mount;
+- (void)unmount;
+- (NSError*)validateAndSetParameters:(NSDictionary*)params;
+- (MFServerPlugin*)plugin;
+- (void)setPauseTimeout:(BOOL)pause;
+
+@end

MFServerFSProtocol.m

@@ -7,7 +7,3 @@
 //
 
 #import "MFServerFSProtocol.h"
-
-
-@implementation MFServerFSProtocol
-@end

MGTransitioningTabView.m

@@ -47,7 +47,7 @@ - (void)drawRect:(NSRect)rect {
 	if (_animation != nil) {
 		[_transitionFilter setValue:[NSNumber numberWithFloat:[_animation currentValue]] forKey:@"inputTime"];
 		CIImage *outputImage = [_transitionFilter valueForKey:@"outputImage"];
-		[outputImage drawInRect:_imageRect fromRect:NSMakeRect(0, _imageRect.size.height, _imageRect.size.width, -imageRect.size.height) operation:NSCompositeSourceOver fraction:1.0];
+		[outputImage drawInRect:_imageRect fromRect:NSMakeRect(0, _imageRect.size.height, _imageRect.size.width, -_imageRect.size.height) operation:NSCompositeSourceOver fraction:1.0];
 
 	}
 }

MacFusion2.xcodeproj/project.pbxproj

@@ -82,6 +82,7 @@
 		D439D5950D09E4390025574A /* MFServerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D439D5940D09E4390025574A /* MFServerProtocol.h */; };
 		D439D6D60D0A0FDE0025574A /* sshfsConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = D439D6D50D0A0FDE0025574A /* sshfsConfiguration.xib */; };
 		D441DB630D995C2B009F869A /* MFClientProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D441DB620D995C2B009F869A /* MFClientProtocol.h */; };
+		D44EDA88116162B8000E9FEA /* MFServerFSProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = D44EDA87116162B8000E9FEA /* MFServerFSProtocol.m */; };
 		D45579170D40715F00669882 /* MFInertButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D45579160D40715F00669882 /* MFInertButton.m */; };
 		D45F0D950D8B3396008CC7E3 /* macfusionAgent-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D45F0D940D8B3396008CC7E3 /* macfusionAgent-Info.plist */; };
 		D4656C8D0D6FD6DC00DE2208 /* sshfs_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D4656C8B0D6FD6DC00DE2208 /* sshfs_icon.icns */; };
@@ -400,6 +401,7 @@
 		D439D6D50D0A0FDE0025574A /* sshfsConfiguration.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = sshfsConfiguration.xib; sourceTree = "<group>"; };
 		D441521F0CE2933C001EEF36 /* sshfs.mfplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sshfs.mfplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		D441DB620D995C2B009F869A /* MFClientProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFClientProtocol.h; sourceTree = "<group>"; };
+		D44EDA87116162B8000E9FEA /* MFServerFSProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFServerFSProtocol.m; sourceTree = "<group>"; };
 		D44FA6AB0DA7D0FB007AB734 /* MFClientDelegateProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFClientDelegateProtocol.h; sourceTree = "<group>"; };
 		D45579150D40715F00669882 /* MFInertButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFInertButton.h; sourceTree = "<group>"; };
 		D45579160D40715F00669882 /* MFInertButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFInertButton.m; sourceTree = "<group>"; };
@@ -605,6 +607,7 @@
 		08FB7795FE84155DC02AAC07 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				D44EDA87116162B8000E9FEA /* MFServerFSProtocol.m */,
 				D4905C6B0D394A5D00E21C1E /* MFServerFS.h */,
 				D4905C6C0D394A5D00E21C1E /* MFServerFS.m */,
 				D4905C6E0D394A6700E21C1E /* MFServerPlugin.h */,
@@ -1394,6 +1397,7 @@
 				D47F688F0D98524B00E91D45 /* MFLogViewerTableCell.m in Sources */,
 				D47DF17A0DA034AF00C0F934 /* MFClientFSUI.m in Sources */,
 				D40363300E0780BF0048BB63 /* MFEditingController.m in Sources */,
+				D44EDA88116162B8000E9FEA /* MFServerFSProtocol.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1834,8 +1838,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -2117,8 +2119,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -2528,8 +2528,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -2556,7 +2554,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH)";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;

Menuling/MFMenulingAppDelegate.h

@@ -20,7 +20,7 @@
 
 @class MFClient, MFQuickMountController;
 
-@interface MFMenulingAppDelegate : NSObject <MFClientFSDelegateProtocol, MFClientDelegateProtocol> {
+@interface MFMenulingAppDelegate : NSObject <MFClientFSDelegateProtocol, MFClientDelegateProtocol, NSMenuDelegate> {
 	NSStatusItem* statusItem;
 	MFClient* client;
 	MFQuickMountController* qmController;