diff --git a/AKPreferenceController.m b/AKPreferenceController.m
index 2d8ddc841..b569dcd03 100644
--- a/AKPreferenceController.m
+++ b/AKPreferenceController.m
@@ -383,7 +383,9 @@ - (void)populateFieldsForAccountAtIndex:(NSInteger)index
[username setEnabled:NO];
[password setEnabled:NO];
[substitutePlusCharacterCheckBox setEnabled:NO];
+ [substitutePlusCharacterCheckBox setState:[[accountDict objectForKey:AKSubstitutePlusCharacter] integerValue]];
[plusCharacterSubstitution setEnabled:NO];
+ [useProxyCheckBox setState:[[accountDict objectForKey:AKUseProxy] integerValue]];
[useProxyCheckBox setEnabled:NO];
[proxyHost setEnabled:NO];
[proxyPort setEnabled:NO];
@@ -399,12 +401,17 @@ - (void)populateFieldsForAccountAtIndex:(NSInteger)index
[substitutePlusCharacterCheckBox setState:[[accountDict objectForKey:AKSubstitutePlusCharacter] integerValue]];
if ([substitutePlusCharacterCheckBox state] == NSOnState)
[plusCharacterSubstitution setEnabled:YES];
+ else
+ [plusCharacterSubstitution setEnabled:NO];
[useProxyCheckBox setEnabled:YES];
[useProxyCheckBox setState:[[accountDict objectForKey:AKUseProxy] integerValue]];
if ([useProxyCheckBox state] == NSOnState) {
[proxyHost setEnabled:YES];
[proxyPort setEnabled:YES];
+ } else {
+ [proxyHost setEnabled:NO];
+ [proxyPort setEnabled:NO];
}
}
@@ -420,10 +427,18 @@ - (void)populateFieldsForAccountAtIndex:(NSInteger)index
if ([accountDict objectForKey:AKPlusCharacterSubstitutionString] != nil)
[plusCharacterSubstitution setStringValue:[accountDict objectForKey:AKPlusCharacterSubstitutionString]];
+ else
+ [plusCharacterSubstitution setStringValue:@"00"];
+
if ([accountDict objectForKey:AKProxyHost] != nil)
[proxyHost setStringValue:[accountDict objectForKey:AKProxyHost]];
+ else
+ [proxyHost setStringValue:@""];
+
if ([[accountDict objectForKey:AKProxyPort] integerValue] > 0)
[proxyPort setIntegerValue:[[accountDict objectForKey:AKProxyPort] integerValue]];
+ else
+ [proxyPort setStringValue:@""];
} else {
[accountEnabledCheckBox setState:NSOffState];
diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib
index 32033cf05..9af65ae74 100644
--- a/English.lproj/Preferences.xib
+++ b/English.lproj/Preferences.xib
@@ -8,7 +8,7 @@
353.00