Simpler option names.

Author: Mento

Diff for: Docs/ADVANCED PREFERENCES

@@ -27,8 +27,8 @@
 	defaults write org.gpgtools.common DebugLog -bool YES|NO
 
 
-* Disable OpenPGP for reading messages. *
-	defaults write org.gpgtools.gpgmail DisableOpenPGPForReading -bool YES|NO
+* Disable or enable OpenPGP for reading messages. *
+	defaults write org.gpgtools.gpgmail UseOpenPGPForReading -bool YES|NO
 
 
 * FOR DEBUGGING ONLY: Hides all signature attachments, even if they fail to verify. *

Diff for: Resources/GPGMailBundle.defaults

@@ -14,10 +14,10 @@
 	AttachKeyToOutgoingMessages = NO;
 	AllowSymmetricEncryption = NO;
 	ShowAccountNameForKeysOfSameAddress = NO;
-	DoNotEncryptToSelf = NO;
+	EncryptToSelf = YES;
 
 	/* Viewing */
-	DisableOpenPGPForReading = NO;
+	UseOpenPGPForReading = YES;
 	HideAllSignatureAttachments = NO;
 	CreatePreviewSnippets = NO;
 

Diff for: Source/Message+GPGMail.m

@@ -438,7 +438,7 @@ - (BOOL)shouldBePGPProcessed {
 //        return NO;
 
     // OpenPGP is disabled for reading? Return false.
-    if([[GPGOptions sharedOptions] boolForKey:@"DisableOpenPGPForReading"])
+    if(![[GPGOptions sharedOptions] boolForKey:@"UseOpenPGPForReading"])
         return NO;
 
     // Message was actively selected by the user? PGP process message.

Diff for: Source/MimePart+GPGMail.m

@@ -1951,7 +1951,7 @@ - (id)MANewEncryptedPartWithData:(NSData *)data recipients:(id)recipients encryp
 	GPGKey *senderPublicKey = nil;
 
 	// Split the recipients in normal and bcc recipients.
-	BOOL doNotEncryptToSelf = [[GPGOptions sharedOptions] boolForKey:@"DoNotEncryptToSelf"];
+	BOOL encryptToSelf = [[GPGOptions sharedOptions] boolForKey:@"EncryptToSelf"];
     NSMutableArray *normalRecipients = [NSMutableArray arrayWithCapacity:1];
     NSMutableArray *bccRecipients = [NSMutableArray arrayWithCapacity:1];
 
@@ -1960,7 +1960,7 @@ - (id)MANewEncryptedPartWithData:(NSData *)data recipients:(id)recipients encryp
         if ([recipientType isEqualTo:@"bcc"]) {
             [bccRecipients addObject:recipient];
         } else {
-			// If DoNotEncryptToSelf is enabled, don't add the sender to the recipients.
+			// If encryptToSelf is disabled, don't add the sender to the recipients.
 			// Of course this has the effect that the sent mails can't be read by the sender,
 			// but that's exactly what this option is for.
 			if ([recipientType isEqualToString:@"from"]) {
@@ -1975,7 +1975,7 @@ - (id)MANewEncryptedPartWithData:(NSData *)data recipients:(id)recipients encryp
 					}
 				}
 
-				if (doNotEncryptToSelf)
+				if (!encryptToSelf)
 					continue;
 
 				// In order to fix a problem where a random key matching an address