Merge branch 'nopre'

GPGTools · Mar 23, 2011 · 631ccfb · 631ccfb
2 parents 99e2762 + 675e382
commit 631ccfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/GPGServices.m b/GPGServices.m
@@ -656,22 +656,12 @@ -(void)dealWithPasteboard:(NSPasteboard *)pboard
 	if(mode!=MyKeyService && mode!=MyFingerprintService)
 	{
 		NSString* type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:
-                                                         NSHTMLPboardType, 
                                                          NSStringPboardType, 
                                                          NSRTFPboardType,
                                                          NSFilenamesPboardType, 
                                                          nil]];
 
-		if([type isEqualToString:NSHTMLPboardType])
-		{
-			if(!(pboardString = [pboard stringForType:NSHTMLPboardType]))
-			{
-				*error=[NSString stringWithFormat:@"Error: Could not perform GPG operation. Pasteboard could not supply HTML string."];
-				[self exitServiceRequest];
-				return;
-			}
-		}
-		else if([type isEqualToString:NSStringPboardType])
+        if([type isEqualToString:NSStringPboardType])
 		{
 			if(!(pboardString = [pboard stringForType:NSStringPboardType]))
 			{
@@ -727,9 +717,9 @@ -(void)dealWithPasteboard:(NSPasteboard *)pboard
 
 	if(newString!=nil)
 	{
-		[pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType,NSHTMLPboardType,nil] owner:nil];
+		[pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType,NSRTFPboardType,nil] owner:nil];
 		[pboard setString:newString forType:NSStringPboardType];
-		[pboard setString:[NSString stringWithFormat:@"<pre>%@</pre>",newString] forType:NSHTMLPboardType];
+   		[pboard setString:newString forType:NSRTFPboardType];
 	}
 	[self exitServiceRequest];
 }

diff --git a/Info.plist b/Info.plist
@@ -47,7 +47,6 @@
 			<array/>
 			<key>NSSendTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 				<string>NSRTFPboardType</string>
 			</array>
@@ -70,11 +69,9 @@
 			<key>NSReturnTypes</key>
 			<array>
 				<string>NSStringPboardType</string>
-				<string>NSHTMLPboardType</string>
 			</array>
 			<key>NSSendTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 				<string>NSRTFPboardType</string>
 			</array>
@@ -97,11 +94,9 @@
 			<key>NSReturnTypes</key>
 			<array>
 				<string>NSStringPboardType</string>
-				<string>NSHTMLPboardType</string>
 			</array>
 			<key>NSSendTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 				<string>NSRTFPboardType</string>
 			</array>
@@ -124,11 +119,9 @@
 			<key>NSReturnTypes</key>
 			<array>
 				<string>NSStringPboardType</string>
-				<string>NSHTMLPboardType</string>
 			</array>
 			<key>NSSendTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 				<string>NSRTFPboardType</string>
 			</array>
@@ -150,7 +143,6 @@
 			<string>GPGServices</string>
 			<key>NSReturnTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>NSSendTypes</key>
@@ -173,7 +165,6 @@
 			<string>GPGServices</string>
 			<key>NSReturnTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>NSSendTypes</key>
@@ -198,7 +189,6 @@
 			<array/>
 			<key>NSSendTypes</key>
 			<array>
-				<string>NSHTMLPboardType</string>
 				<string>NSStringPboardType</string>
 				<string>NSRTFPboardType</string>
 			</array>