Ticket #1567: encoding.patch

Panels/JVDirectChatPanel.m

@@ -776 +776 @@
         [options setObject:[NSNumber numberWithUnsignedInt:NSISOLatin1StringEncoding] forKey:@"StringEncoding"];
         messageString = [NSMutableAttributedString attributedStringWithChatFormat:message options:options];
 
-        NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithObjectsAndKeys:baseFont, NSFontAttributeName, nil];
-        NSMutableAttributedString *error = [[[NSMutableAttributedString alloc] initWithString:[@" " stringByAppendingString:NSLocalizedString( @"incompatible encoding", "encoding of the message different than your current encoding" )] attributes:attributes] autorelease];
-        [error addAttribute:@"CSSClasses" value:[NSSet setWithObjects:@"error", @"encoding", nil] range:NSMakeRange( 1, ( [error length] - 1 ) )];
-        [messageString appendAttributedString:error];
+        /* Some of us don't want the (Incompatible Encoding) at the end of each line. So this option makes it hideable */
+        /* To hide the string, just do defaults write info.colloquy JVChatHideIncompatibleEncoding -bool true */
+        if (![[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatHideIncompatibleEncoding"]) {
+            NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithObjectsAndKeys:baseFont, NSFontAttributeName, nil];
+            NSMutableAttributedString *error = [[[NSMutableAttributedString alloc] initWithString:[@" " stringByAppendingString:NSLocalizedString( @"incompatible encoding", "encoding of the message different than your current encoding" )] attributes:attributes] autorelease];
+            [error addAttribute:@"CSSClasses" value:[NSSet setWithObjects:@"error", @"encoding", nil] range:NSMakeRange( 1, ( [error length] - 1 ) )];
+            [messageString appendAttributedString:error];
+        }
     }
 
     if( ! [messageString length] ) {