Skip to content

Commit

Permalink
Wrong callback selector.
Browse files Browse the repository at this point in the history
  • Loading branch information
emsquared committed Jul 23, 2012
1 parent bd7d091 commit 6c5f2b9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Classes/Controllers/TXMasterController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 9 additions & 3 deletions Classes/Views/Channel View/LVCLogRenderer.m
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -267,7 +273,7 @@ NSInteger mapColorValue(NSColor *color)
if (attr & _effectMask) {
[s appendString:@"<span class=\"effect\" style=\""];

if (attr & _rendererBoldFormatAttribute) [s appendString:@"font-weight:bold;"];
if (attr & _rendererBoldFormatAttribute) [s appendString:@"font-weight:bold;"];
if (attr & _rendererItalicFormatAttribute) [s appendString:@"font-style:italic;"];
if (attr & _rendererUnderlineFormatAttribute) [s appendString:@"text-decoration:underline;"];

Expand Down
4 changes: 2 additions & 2 deletions Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<key>TXBundleBuildCodeName</key>
<string>Turtle Soup</string>
<key>TXBundleBuildNumber</key>
<string>11958</string>
<string>11959</string>
<key>TXBundleBuildReference</key>
<string>2.1.1-245-gdca2209-appstore,llvm4.0</string>
<string>2.1.1-246-gbd7d091-appstore,llvm4.0</string>
</dict>
</plist>

0 comments on commit 6c5f2b9

Please sign in to comment.