Changeset 23034

Timestamp:

04/03/2008 11:21:13 AM (8 months ago)

Author:

evands

Message:

I see no reason to force default attributes for decoded text to Lucda Grande 12; if the incoming HTML doesn't specify a font or size, we should produce an NSAttributedString which similarly doesn't specify. Along with [23033], fixes #5561 and fixes #9524.

Files:

• trunk/Frameworks/Adium Framework/Source/AIHTMLDecoder.m (modified) (2 diffs)

trunk/Frameworks/Adium Framework/Source/AIHTMLDecoder.m

@@ -66 +66 @@
-@implementation AIHTMLDecoder
-
-static AITextAttributes *_defaultTextDecodingAttributes = nil;
-static NSString                 *horizontalRule = nil;
-
-+ (void)initialize
-{
-        if (!_defaultTextDecodingAttributes) {
-                _defaultTextDecodingAttributes = [[AITextAttributes textAttributesWithFontFamily:@"Lucida Grande" traits:0 size:12] retain];
-        }
-
-        //Set up the horizontal rule which will be searched-for when encoding and inserted when decoding
-!horizontalRule
+(self == [AIHTMLDecoder class])
-#define HORIZONTAL_BAR                  0x2013
-#define HORIZONTAL_RULE_LENGTH  12
-
+
-                const unichar separatorUTF16[HORIZONTAL_RULE_LENGTH] = {
-                        '\n', HORIZONTAL_BAR, HORIZONTAL_BAR, HORIZONTAL_BAR, HORIZONTAL_BAR, HORIZONTAL_BAR,
@@ -1059 +1054 @@
-                textAttributes = [AITextAttributes textAttributesWithDictionary:inDefaultAttributes];
-        } else {
-_defaultTextDecodingAttributes copy
-
-
+[AITextAttributes alloc] init
+
+
-    attrString = [[NSMutableAttributedString alloc] init];
-