diff --git a/Classes/Controllers/TXMasterController.m b/Classes/Controllers/TXMasterController.m index 9931bb262c..47e1fdcb59 100755 --- a/Classes/Controllers/TXMasterController.m +++ b/Classes/Controllers/TXMasterController.m @@ -674,7 +674,7 @@ - (void)themeStyleDidChange:(NSNotification *)note [prompt sheetWindowWithQuestion:[NSApp keyWindow] target:[TLOPopupPrompts class] - action:@selector(popupPromptNULLSelector:) + action:@selector(popupPromptNilSelector:) body:TXTFLS(@"ThemeChangeOverridePromptMessage", theme, sf) title:TXTLS(@"ThemeChangeOverridePromptTitle") defaultButton:TXTLS(@"OkButton") diff --git a/Classes/Views/Channel View/LVCLogRenderer.m b/Classes/Views/Channel View/LVCLogRenderer.m index 521fd3c703..43efadc55d 100755 --- a/Classes/Views/Channel View/LVCLogRenderer.m +++ b/Classes/Views/Channel View/LVCLogRenderer.m @@ -49,7 +49,13 @@ #define _backgroundColorMask (0xF0) #define _textColorMask (0x0F) -#define _effectMask (_rendererBoldFormatAttribute | _rendererUnderlineFormatAttribute | _rendererItalicFormatAttribute | _rendererTextColorAttribute | _rendererBackgroundColorAttribute) +#define _effectMask ( \ + _rendererBoldFormatAttribute | \ + _rendererUnderlineFormatAttribute | \ + _rendererItalicFormatAttribute | \ + _rendererTextColorAttribute | \ + _rendererBackgroundColorAttribute \ + ) NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context); @@ -95,7 +101,7 @@ static NSInteger getNextAttributeRange(attr_t *attrBuf, NSInteger start, NSInteg return (len - start); } -NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context) +NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context) { return (s1.nick.length <= s2.nick.length); } @@ -267,7 +273,7 @@ NSInteger mapColorValue(NSColor *color) if (attr & _effectMask) { [s appendString:@"TXBundleBuildCodeName Turtle Soup TXBundleBuildNumber - 11958 + 11959 TXBundleBuildReference - 2.1.1-245-gdca2209-appstore,llvm4.0 + 2.1.1-246-gbd7d091-appstore,llvm4.0