Changeset 77

Timestamp:

12/27/05 14:56:25 (3 years ago)

Author:

mrowe

Message:

Run a quick spaces -> tabs conversion on all source files for consistencies sake. Updated the Xcode project to have all source files use tabs for indentation in preference to the users default setting to make it less likely spaces will creep in again. Closes #38.

Files:

• trunk/AgentController.m (modified) (2 diffs)
• trunk/Controller.m (modified) (6 diffs)
• trunk/Libs/SSHAgent.m (modified) (3 diffs)
• trunk/Libs/SSHTunnel.m (modified) (1 diff)
• trunk/PreferenceViews/KeysView.m (modified) (2 diffs)
• trunk/PreferenceViews/PreferenceView.m (modified) (1 diff)
• trunk/PreferenceViews/SecurityView.m (modified) (5 diffs)
• trunk/SSHKeychain.xcodeproj/project.pbxproj (modified) (2 diffs)
• trunk/UpdateController.m (modified) (1 diff)

trunk/AgentController.m

@@ -556 +556 @@
-        [theTool setArgument:path];
-        
-        
+       
-        [theTool setEnvironmentVariable:@"SSH_ASKPASS" withValue:
-                [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"PassphraseRequester"]];
@@ -701 +701 @@
-                        [task setLaunchPath:@"/bin/ps"];
-                        [task setArguments:[NSArray arrayWithObject:@"wxo command"]];
-        
+       
-
-                        [task launch];

trunk/Controller.m

@@ -82 +82 @@
-        ];
-
-
+
-        [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
-
-        path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents/Info.plist"];
-        dict = [[[NSMutableDictionary alloc] initWithContentsOfFile:path] autorelease];
-
+
-        if(dict == nil)
-        {
-                dict = [NSMutableDictionary dictionary];
-        }
-
+
-        if([[NSUserDefaults standardUserDefaults] integerForKey:DisplayString] == 1)
-        {
@@ -111 +111 @@
-                                NSLog(@"DEBUG: utime on bundlePath failed.");
-                                exit(0);
-                      
+
-
-                        theTask = [[NSTask alloc] init];
@@ -250 +250 @@
-                if(![[NSFileManager defaultManager] fileExistsAtPath:macOSXDir isDirectory:&isDirectory])
-                {
-        
+       
-                }
-
@@ -257 +257 @@
-                {
-                        [[NSFileManager defaultManager] removeFileAtPath:macOSXDir handler:nil];
-        
+       
-                }
-
@@ -364 +364 @@
-        NSString *passphrase, *firstQuestion;
-        NSMutableDictionary *dict;
-        
+       
-
-        ProcessSerialNumber focusSerialNumber;
@@ -387 +387 @@
-        if([question hasPrefix:firstQuestion])
-        {
-                
+               
-                accountName = [[[[question substringFromIndex:[firstQuestion length]]
-                        
-        
-
-        
-        
-                
-                
-                        
-                        
-                
-
-                
-                
-                        
-                        
-                                
-                                
-                                
-
-                                
-                                
-                                        
-                                        
-                                        
-                                
-
-                                
-                                
-                                        
-                                
-                        
-                
-        
-
-        
-        
+                       
+       
+
+       
+       
+               
+               
+                       
+                       
+               
+
+               
+               
+                       
+                       
+                               
+                               
+                               
+
+                               
+                               
+                                       
+                                       
+                                       
+                               
+
+                               
+                               
+                                       
+                               
+                       
+               
+       
+
+       
+       
-                serviceName = "SSHKeychain";
-

trunk/Libs/SSHAgent.m

@@ -43 +43 @@
-        currentAgent = self;
-
-        
-                
-
-        
-                
-
-        
-                
+       
+               
+
+       
+               
+
+       
+               
-        
-        socketPathLock = [[NSLock alloc] init];
@@ -792 +792 @@
-- (void)keysOnAgentStatusChange:(NSNotification *)notification
-{
- 
- 
+
+
-                [keysOnAgentLock lock];
-                if(keysOnAgent)
@@ -803 +803 @@
-                
-                [keysOnAgentLock unlock];
- 
+
-
-        else if([[notification name] isEqualToString:@"AgentFilled"])
- 
+
-                [keysOnAgentLock lock];
-                keysOnAgent = [[[SSHAgent currentAgent] currentKeysOnAgent] retain];

trunk/Libs/SSHTunnel.m

@@ -254 +254 @@
-                [arguments addObject:@"-g"];
-        }
-
-        
-        
+
+       
+       
-        
-        if((tunnelUser) && (![tunnelUser isEqualToString:@""]))

trunk/PreferenceViews/KeysView.m

@@ -251 +251 @@
-        [newKeyGenerateButton setEnabled:YES];
-        
-        
+       
-        {
-                [newKeyProgressText setTextColor:[NSColor redColor]];
@@ -336 +336 @@
-
-- (NSString *)panel:(id)sender userEnteredFilename:(NSString *)filename confirmed:(BOOL)okFlag
-       
+      
-        if((okFlag == YES) && ([[NSFileManager defaultManager] fileExistsAtPath:[sender filename]]))
-        {

trunk/PreferenceViews/PreferenceView.m

@@ -33 +33 @@
-
-- (void)warningPanelWithTitle:(NSString *)title andMessage:(NSString *)message
-       
+
-        NSRunAlertPanel(title, message, nil, nil, nil);
-}

trunk/PreferenceViews/SecurityView.m

@@ -17 +17 @@
-        [addKeysOnConnection setState:[[NSUserDefaults standardUserDefaults] boolForKey:AddKeysOnConnectionString]];
-        [askForConfirmation setState:[[NSUserDefaults standardUserDefaults] boolForKey:AskForConfirmationString]];
-        
+       
-
-        [onSleep selectItemAtIndex:[onSleep indexOfItemWithTag:[prefs integerForKey:OnSleepString]]];
@@ -77 +77 @@
-                [prefs setBool:[addKeysOnConnection state] forKey:AddKeysOnConnectionString];
-                [prefs setBool:[askForConfirmation state] forKey:AskForConfirmationString];
-                
+               
-
-                [prefs setInteger:[[onSleep selectedItem] tag] forKey:OnSleepString];
@@ -93 +93 @@
-                [prefs setBool:YES forKey:AddKeysOnConnectionString];
-                [prefs setBool:NO forKey:AskForConfirmationString];
-                
+               
-
-                [prefs setInteger:1 forKey:OnSleepString];
@@ -147 +147 @@
-                [prefs setBool:YES forKey:AddKeysOnConnectionString];
-                [prefs setBool:NO forKey:AskForConfirmationString];
-                
+               
-
-                [prefs setInteger:1 forKey:OnSleepString];
@@ -160 +160 @@
-                [addKeysOnConnection setState:[prefs boolForKey:AddKeysOnConnectionString]];
-                [askForConfirmation setState:[prefs boolForKey:AskForConfirmationString]];
-                
+               
-
-                [onSleep selectItemAtIndex:[onSleep indexOfItemWithTag:[prefs integerForKey:OnSleepString]]];

trunk/SSHKeychain.xcodeproj/project.pbxproj

@@ -136 +136 @@
-                32CA4F630368D1EE00C91783 /* SSHKeychain_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSHKeychain_Prefix.pch; sourceTree = "<group>"; };
-                8D1107320486CEB800E47090 /* SSHKeychain.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SSHKeychain.app; sourceTree = BUILT_PRODUCTS_DIR; };
-
-
-
-
-
-
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
-                CC341CE006ACF1F300E32630 /* preference_general.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_general.tiff; sourceTree = "<group>"; };
-                CC341CE606ACF3AD00E32630 /* preference_keys.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_keys.tiff; sourceTree = "<group>"; };
-                CC341D0B06AD012C00E32630 /* preference_environment.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_environment.tiff; sourceTree = "<group>"; };
-
-
-
-
-
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
-                CC604C2306AE6B1700B9CEBB /* preference_tunnels.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_tunnels.tiff; sourceTree = "<group>"; };
-
-
-
-
-
-
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
-                CCC9E27506A58DB600422E9E /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; name = English; path = English.lproj/Credits.html; sourceTree = "<group>"; };
-                CCC9E27706A58DB600422E9E /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -192 +192 @@
-                CCC9E42906A6763E00422E9E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
-                CCC9E4FA06A6766400422E9E /* SystemUIPlugin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemUIPlugin.framework; path = /System/Library/PrivateFrameworks/SystemUIPlugin.framework; sourceTree = "<absolute>"; };
-
-
-
-
-
-
-
-
-
-
-
-
-
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
+usesTabs = 1; 
-                CCCDD4A706A576CF00B68ED1 /* PassphraseRequester.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PassphraseRequester.m; sourceTree = "<group>"; };
-
-
+usesTabs = 1; 
+usesTabs = 1; 
-                CCDA608806ACEFD900E2A5B3 /* preference_display.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_display.tiff; sourceTree = "<group>"; };
-                CCDA608906ACEFD900E2A5B3 /* preference_security.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = preference_security.tiff; sourceTree = "<group>"; };
-
-
+usesTabs = 1; 
+usesTabs = 1; 
-/* End PBXFileReference section */
-

trunk/UpdateController.m

@@ -113 +113 @@
-                                andMessage:local(@"NewVersionAvailable")];
-                }
-     
+
-
-        else if([warnings boolValue] == YES)