From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sat, 20 Dec 2003 02:50:59 +0000 (+0000)
Subject: Removed the evil "Requires Checkbox" button as per Joe's request.
X-Git-Tag: v1.2~10
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/086d6be5a155d0390ec1915350ad126c95a88416

Removed the evil "Requires Checkbox" button as per Joe's request.
---

diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib
index b54969d..2bbece9 100755
--- a/English.lproj/Preferences.nib/classes.nib
+++ b/English.lproj/Preferences.nib/classes.nib
@@ -53,7 +53,6 @@
                 songsInAdvance = NSTextField; 
                 trackNumberCheckbox = NSButton; 
                 trackTimeCheckbox = NSButton; 
-                usePasswordCheckbox = NSButton; 
                 useSharedMenuTunesCheckbox = NSButton; 
                 vanishDelaySlider = NSSlider; 
                 vanishEffectPopup = NSPopUpButton; 
diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index 13a7790..6614454 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -22,6 +22,6 @@
 		<integer>6</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7C107</string>
+	<string>7D24</string>
 </dict>
 </plist>
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index 9a4c80f..f4c0dd7 100755
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/NetworkController.m b/NetworkController.m
index f2989e3..ce19757 100755
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -98,7 +98,7 @@ static NetworkController *sharedController;
                                         name:name
                                         port:SERVER_PORT];
         fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"sharedPlayerPassword"];
-        if (fullPass) {
+        if ([fullPass length]) {
             [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
             [serverPass release];
             serverPass = [[NSData alloc] initWithBytes:&buffer length:strlen(&buffer)];
diff --git a/NetworkObject.m b/NetworkObject.m
index 3c941dc..2d7207d 100755
--- a/NetworkObject.m
+++ b/NetworkObject.m
@@ -53,7 +53,7 @@
 
 - (BOOL)requiresPassword
 {
-    return [[NSUserDefaults standardUserDefaults] boolForKey:@"enableSharingPassword"];
+    return [[[NSUserDefaults standardUserDefaults] dataForKey:@"sharedPlayerPassword"] length];
 }
 
 - (BOOL)sendPassword:(NSData *)password
diff --git a/PreferencesController.h b/PreferencesController.h
index 58b97e5..004e929 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -55,7 +55,6 @@
     IBOutlet NSTextField *songsInAdvance;
     IBOutlet NSButton *trackNumberCheckbox;
     IBOutlet NSButton *trackTimeCheckbox;
-    IBOutlet NSButton *usePasswordCheckbox;
     IBOutlet NSButton *useSharedMenuTunesCheckbox;
     IBOutlet NSSlider *vanishDelaySlider;
     IBOutlet NSPopUpButton *vanishEffectPopup;
diff --git a/PreferencesController.m b/PreferencesController.m
index 1aee038..fa8d29d 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -238,7 +238,6 @@ static PreferencesController *prefs = nil;
         [df setBool:state forKey:@"enableSharing"];
         //Disable/enable the use of shared player options
         [useSharedMenuTunesCheckbox setEnabled:!state];
-        [usePasswordCheckbox setEnabled:state];
         [passwordTextField setEnabled:state];
         [nameTextField setEnabled:state];
         [selectSharedPlayerButton setEnabled:NO];
@@ -246,28 +245,29 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 5015 ) {
         [df setObject:[sender stringValue] forKey:@"sharedPlayerName"];
         [[NetworkController sharedController] resetServerName];
-    } else if ( [sender tag] == 5020 ) {
-        [df setBool:SENDER_STATE forKey:@"enableSharingPassword"];
     } else if ( [sender tag] == 5030 ) {
         //Set the server password
         const char *instring = [[sender stringValue] UTF8String];
-        const char *password = "password";
+        const char *password = "p4s5w0rdMT1.2";
         unsigned char *result;
         NSData *hashedPass, *passwordStringHash;
+        if ([[sender stringValue] length] == 0) {
+            [df setObject:[NSData data] forKey:@"sharedPlayerPassword"];
+            return;
+        }
         result = SHA1(instring, strlen(instring), NULL);
         hashedPass = [NSData dataWithBytes:result length:strlen(result)];
         result = SHA1(password, strlen(password), NULL);
         passwordStringHash = [NSData dataWithBytes:result length:strlen(result)];
         if (![hashedPass isEqualToData:passwordStringHash]) {
             [df setObject:hashedPass forKey:@"sharedPlayerPassword"];
-            [sender setStringValue:@"password"];
+            [sender setStringValue:@"p4s5w0rdMT1.2"];
         }
     } else if ( [sender tag] == 5040 ) {
         BOOL state = SENDER_STATE;
         [df setBool:state forKey:@"useSharedPlayer"];
         //Disable/enable the use of sharing options
         [shareMenuTunesCheckbox setEnabled:!state];
-        [usePasswordCheckbox setEnabled:NO];
         [passwordTextField setEnabled:NO];
         [nameTextField setEnabled:NO];
         [selectSharedPlayerButton setEnabled:state];
@@ -847,7 +847,6 @@ static PreferencesController *prefs = nil;
         [useSharedMenuTunesCheckbox setEnabled:NO];
         [selectSharedPlayerButton setEnabled:NO];
         [passwordTextField setEnabled:YES];
-        [usePasswordCheckbox setEnabled:YES];
         [nameTextField setEnabled:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {
         [useSharedMenuTunesCheckbox setState:NSOnState];
@@ -864,9 +863,10 @@ static PreferencesController *prefs = nil;
     [nameTextField setStringValue:serverName];
     
     [selectPlayerBox setContentView:zeroConfView];
-    [usePasswordCheckbox setState:([df boolForKey:@"enableSharingPassword"] ? NSOnState : NSOffState)];
-    if ([df dataForKey:@"sharedPlayerPassword"]) {
-        [passwordTextField setStringValue:@"password"];
+    if ([[df dataForKey:@"sharedPlayerPassword"] length]) {
+        [passwordTextField setStringValue:@"p4s5w0rdMT1.2"];
+    } else {
+        [passwordTextField setStringValue:@""];
     }
     if ([df stringForKey:@"sharedPlayerHost"]) {
         [hostTextField setStringValue:[df stringForKey:@"sharedPlayerHost"]];
diff --git a/libValidate.a b/libValidate.a
index 4fb4485..7424448 100755
Binary files a/libValidate.a and b/libValidate.a differ