adium 3843:2021a30141d9: closing this branch before merging to d...
commits at adium.im
commits at adium.im
Wed Apr 6 05:22:56 UTC 2011
details: http://hg.adium.im/adium/rev/2021a30141d9
revision: 3843:2021a30141d9
branch: AILoggerWithBlocks
author: Stephen Holt <sholt at adium.im>
date: Tue Apr 05 22:17:26 2011 -0700
closing this branch before merging to default
Subject: adium 3844:be26860de314: Merging AILoggerWithBlocks branch into default.
details: http://hg.adium.im/adium/rev/be26860de314
revision: 3844:be26860de314
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Tue Apr 05 22:21:32 2011 -0700
Merging AILoggerWithBlocks branch into default.
diffs (487 lines):
diff -r c6a0c0da810e -r be26860de314 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Tue Apr 05 21:56:32 2011 -0700
+++ b/ChangeLogs/Changes.txt Tue Apr 05 22:21:32 2011 -0700
@@ -44,7 +44,7 @@
* Rounded user icon in the chat window toolbar. (#3757)
Message View
- * Added the "lastFocus" class for message styles to the latest message received while the chat didn't have focus.
+ * Added the "lastFocus" class for message styles to the latest message received while the chat didn't have focus, and "regainedFocus" for the first message received while the chat has regained focus after having previously lost it.
Transcript Viewer
* Added next/previous buttons for highlighted search terms within a transcript (similar to Safari).
diff -r c6a0c0da810e -r be26860de314 Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m Tue Apr 05 22:21:32 2011 -0700
@@ -34,18 +34,7 @@
- (void)showMenuForSegment:(NSInteger)segment
{
NSView *view = [self window].contentView;
- if ([NSApp isOnSnowLeopardOrBetter])
- [self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
- else{
- NSRect frame = self.frame;
- frame.origin.x += 10.0f;
- frame.origin.y -= 23.0f;
-
- NSPopUpButtonCell *popUpButtonCell = [[[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO] autorelease];
- [popUpButtonCell setMenu:self.menu];
- [popUpButtonCell selectItem:nil];
- [popUpButtonCell performClickWithFrame:frame inView:view];
- }
+ [self.menu popUpMenuPositioningItem:nil atLocation:self.frame.origin inView:view];
}
@end
diff -r c6a0c0da810e -r be26860de314 Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m
--- a/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AISharedWriterQueue.m Tue Apr 05 22:21:32 2011 -0700
@@ -42,8 +42,7 @@
[newWriterQueue release];
[sharedWriterQueue setMaxConcurrentOperationCount:1];
- if ([NSApp isOnSnowLeopardOrBetter])
- [sharedWriterQueue performSelector:@selector(setName:) withObject:@"AISharedWriterQueue"];
+ [sharedWriterQueue setName:@"AISharedWriterQueue"];
}
return sharedWriterQueue;
diff -r c6a0c0da810e -r be26860de314 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Apr 05 22:21:32 2011 -0700
@@ -419,22 +419,20 @@
[self setContinuousSpellCheckingEnabled:[[prefDict objectForKey:KEY_SPELL_CHECKING] boolValue]];
}
- if ([NSApp isOnSnowLeopardOrBetter]) {
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_DASH]) {
[self setAutomaticDashSubstitutionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DASH] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_DATA_DETECTORS]) {
[self setAutomaticDataDetectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_DATA_DETECTORS] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_REPLACEMENT]) {
[self setAutomaticTextReplacementEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_REPLACEMENT] boolValue]];
- }
+ }
- if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
+ if (!key || [key isEqualToString:KEY_SUBSTITUTION_SPELLING]) {
[self setAutomaticSpellingCorrectionEnabled:[[prefDict objectForKey:KEY_SUBSTITUTION_SPELLING] boolValue]];
- }
}
if (!key || [key isEqualToString:KEY_SUBSTITUTION_COPY_PASTE]) {
diff -r c6a0c0da810e -r be26860de314 Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m Tue Apr 05 22:21:32 2011 -0700
@@ -57,15 +57,6 @@
keyEquivalent:@""] autorelease];
[adium.menuController addContextualMenuItem:menuItem toLocation:Context_TextView_LinkEditing];
[self registerToolbarItem];
-
- //rm link context
- if (![NSApp isOnSnowLeopardOrBetter]) {
- menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:RM_LINK_TITLE
- target:self
- action:@selector(removeFormattedLink:)
- keyEquivalent:@""] autorelease];
- [adium.menuController addContextualMenuItem:menuItem toLocation:Context_TextView_LinkEditing];
- }
}
- (void)uninstallPlugin
diff -r c6a0c0da810e -r be26860de314 Plugins/WebKit Message View/AIWebKitMessageViewController.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.h Tue Apr 05 21:56:32 2011 -0700
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.h Tue Apr 05 22:21:32 2011 -0700
@@ -50,6 +50,7 @@
//Focus tracking
BOOL nextMessageFocus;
+ BOOL nextMessageRegainedFocus;
}
/*!
diff -r c6a0c0da810e -r be26860de314 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m Tue Apr 05 22:21:32 2011 -0700
@@ -132,6 +132,7 @@
* classed as such.
*/
nextMessageFocus = YES;
+ nextMessageRegainedFocus = YES;
//Observe preference changes.
[adium.preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_WEBKIT_REGULAR_MESSAGE_DISPLAY];
@@ -487,6 +488,7 @@
[previousContent release];
previousContent = nil;
nextMessageFocus = NO;
+ nextMessageRegainedFocus = NO;
[chat clearUnviewedContentCount];
}
@@ -708,6 +710,7 @@
[content addDisplayClass:@"firstFocus"];
nextMessageFocus = NO;
+ nextMessageRegainedFocus = YES;
}
// Add a class for "this content received while out of focus"
@@ -715,6 +718,7 @@
[content addDisplayClass:@"focus"];
[content addDisplayClass:@"lastFocus"];
+ // if there's something else already lastFocus, then unset it
DOMNodeList *nodeList = [webView.mainFrameDocument querySelectorAll:@".lastFocus"];
DOMHTMLElement *node = nil; NSMutableArray *classes = nil;
for (unsigned i = 0; i < nodeList.length; i++)
@@ -731,6 +735,17 @@
}
}
+ /* Only if the message is a group chat message that should be postprocessed, and it's in the active chat
+ * with something already focussed (!nextMessageFocus) and nothing already regainedFocussed
+ * (nextMessageRegainedFocus), _then_ this message will be regainedFocus.
+ */
+ if (content.postProcessContent && content.chat.isGroupChat && adium.interfaceController.activeChat == content.chat
+ && !nextMessageFocus && nextMessageRegainedFocus) {
+
+ nextMessageRegainedFocus = NO;
+ [content addDisplayClass:@"regainedFocus"];
+ }
+
//Add the content object
[self _appendContent:content
similar:similar
@@ -1514,6 +1529,7 @@
// The next message being inserted needs to add a mark.
nextMessageFocus = YES;
+ nextMessageRegainedFocus = NO;
DOMNodeList *nodeList = [webView.mainFrameDocument querySelectorAll:@".focus"];
DOMHTMLElement *node = nil; NSMutableArray *classes = nil;
@@ -1524,6 +1540,22 @@
[classes removeObject:@"focus"];
[classes removeObject:@"firstFocus"];
+ [classes removeObject:@"lastFocus"];
+
+ node.className = [classes componentsJoinedByString:@" "];
+
+ [classes release];
+ }
+
+ // Also remove .regainedFocus. By definition this should _not_ have class .focus too, so make a new list
+ DOMNodeList *nodeListRegained = [webView.mainFrameDocument querySelectorAll:@".regainedFocus"];
+
+ for (unsigned i = 0; i < nodeListRegained.length; i++)
+ {
+ node = (DOMHTMLElement *)[nodeListRegained item:i];
+ classes = [[node.className componentsSeparatedByString:@" "] mutableCopy];
+
+ [classes removeObject:@"regainedFocus"];
node.className = [classes componentsJoinedByString:@" "];
diff -r c6a0c0da810e -r be26860de314 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Tue Apr 05 22:21:32 2011 -0700
@@ -685,11 +685,7 @@
}
//Alphabetize the variants
- if ([NSApp isOnSnowLeopardOrBetter]) {
- [availableVariants sortUsingSelector:@selector(localizedStandardCompare:)];
- } else {
- [availableVariants sortUsingSelector:@selector(compare:)];
- }
+ [availableVariants sortUsingSelector:@selector(localizedStandardCompare:)];
return availableVariants;
}
diff -r c6a0c0da810e -r be26860de314 Resources/ContactListWindow.xib
--- a/Resources/ContactListWindow.xib Tue Apr 05 21:56:32 2011 -0700
+++ b/Resources/ContactListWindow.xib Tue Apr 05 22:21:32 2011 -0700
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.SystemVersion">11A419</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1530</string>
+ <string key="IBDocument.AppKitVersion">1115.2</string>
+ <string key="IBDocument.HIToolboxVersion">549.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1305</string>
+ <string key="NS.object.0">1530</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,13 +46,14 @@
<object class="NSWindowTemplate" id="43046457">
<int key="NSWindowStyleMask">4111</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{30, 654}, {213, 410}}</string>
+ <string key="NSWindowRect">{{122, 488}, {213, 410}}</string>
<int key="NSWTFlags">1881669632</int>
<string key="NSWindowTitle"/>
<string key="NSWindowClass">AIDockingWindow</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="263109925">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -74,7 +75,7 @@
<string key="NSFrameSize">{213, 410}</string>
<reference key="NSSuperview" ref="58758836"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="374111282"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
@@ -156,6 +157,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
+ <int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<string key="NSFrameSize">{213, 410}</string>
@@ -202,8 +204,8 @@
<string key="NSFrameSize">{213, 410}</string>
<reference key="NSSuperview" ref="263109925"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="374111282"/>
- <int key="NSsFlags">560</int>
+ <reference key="NSNextKeyView" ref="58758836"/>
+ <int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="593971232"/>
<reference key="NSHScroller" ref="374111282"/>
<reference key="NSContentView" ref="58758836"/>
@@ -216,10 +218,10 @@
<reference key="NSNextKeyView" ref="166732467"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMaxSize">{1e+13, 1e+13}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
</object>
<object class="NSCustomView" id="951015401">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">258</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -240,7 +242,6 @@
</object>
<string key="NSFrameSize">{36, 36}</string>
<reference key="NSSuperview" ref="951015401"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="673854253">
<int key="NSCellFlags">270663168</int>
@@ -262,7 +263,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{17, 0}, {113, 18}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIHoveringPopUpButton</string>
<string key="NSExtension">NSButton</string>
</object>
@@ -271,7 +271,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{17, 17}, {113, 18}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIContactListNameButton</string>
<string key="NSExtension">NSButton</string>
</object>
@@ -292,7 +291,6 @@
</object>
<string key="NSFrame">{{3, 11}, {16, 16}}</string>
<reference key="NSSuperview" ref="128062098"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="93881662">
<int key="NSCellFlags">130560</int>
@@ -307,14 +305,11 @@
</object>
<string key="NSFrame">{{36, 1}, {134, 35}}</string>
<reference key="NSSuperview" ref="951015401"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
</object>
<string key="NSFrameSize">{170, 36}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">AIWindowDraggingView</string>
<string key="NSExtension">NSView</string>
</object>
diff -r c6a0c0da810e -r be26860de314 Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Source/AIContactListUserPictureMenuController.m Tue Apr 05 22:21:32 2011 -0700
@@ -112,13 +112,7 @@
name:NSWindowWillCloseNotification
object:[picker window]];
- if ([NSApp isOnSnowLeopardOrBetter]) {
- [menu popUpMenuPositioningItem:[menu itemAtIndex:0] atLocation:NSMakePoint(2.0f, -4.0f) inView:imagePicker];
- } else {
- NSPopUpButtonCell *popUpButtonCell = [[[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO] autorelease];
- [popUpButtonCell setMenu:menu];
- [popUpButtonCell performClickWithFrame:NSMakeRect(12.0f, -12.0f, 0.0f, 0.0f) inView:imagePicker];
- }
+ [menu popUpMenuPositioningItem:[menu itemAtIndex:0] atLocation:NSMakePoint(2.0f, -4.0f) inView:imagePicker];
}
return self;
diff -r c6a0c0da810e -r be26860de314 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Source/AIListWindowController.m Tue Apr 05 22:21:32 2011 -0700
@@ -294,16 +294,14 @@
[[self window] setLevel:level];
}
-//A “stationary†window stays pinned to the desktop during Exposé. A supported API for this was introduced in Snow Leopard.
-- (void)setCollectionBehaviorOfWindow:(NSWindow *)window
- showOnAllSpaces:(BOOL)allSpaces
- isStationary:(BOOL)stationary
+// A "stationary" window stays pinned to the desktop during ExposŽ
+- (void)setCollectionBehaviorOfWindow:(NSWindow *)window showOnAllSpaces:(BOOL)allSpaces isStationary:(BOOL)stationary
{
NSWindowCollectionBehavior behavior = NSWindowCollectionBehaviorDefault;
if (allSpaces)
behavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
- if (stationary && [NSApp isOnSnowLeopardOrBetter])
+ if (stationary)
behavior |= NSWindowCollectionBehaviorStationary;
[window setCollectionBehavior:behavior];
diff -r c6a0c0da810e -r be26860de314 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Source/AILoggerPlugin.m Tue Apr 05 22:21:32 2011 -0700
@@ -1022,7 +1022,7 @@
BOOL dirty = NO;
NSString *contentType = [content type];
NSString *date = [[[content date] dateWithCalendarFormat:nil timeZone:nil] ISO8601DateString];
-
+
if ([contentType isEqualToString:CONTENT_MESSAGE_TYPE] ||
[contentType isEqualToString:CONTENT_CONTEXT_TYPE]) {
NSMutableArray *attributeKeys = [NSMutableArray arrayWithObjects:@"sender", @"time", nil];
@@ -1477,7 +1477,7 @@
} else if (documentText) {
CFRelease(documentText);
}
-
+
dispatch_semaphore_signal(jobSemaphore);
CFRelease(document);
@@ -1567,7 +1567,7 @@
if ([_dirtySet count] > 0 && bself.canSaveDirtyLogSet) {
dispatch_async(ioQueue, ^{
[[_dirtySet allObjects] writeToFile:[bself _dirtyLogSetPath]
- atomically:NO];
+ atomically:NO];
});
}
});
diff -r c6a0c0da810e -r be26860de314 Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Source/AdiumPasswords.m Tue Apr 05 22:21:32 2011 -0700
@@ -66,8 +66,7 @@
if(!OSAtomicCompareAndSwapPtrBarrier(nil, newQueue, (void *)&passwordQueue))
[newQueue release];
- if([NSApp isOnSnowLeopardOrBetter])
- [passwordQueue performSelector:@selector(setName:) withObject:@"AdiumPasswordsOperationQueue"];
+ [passwordQueue setName:@"AdiumPasswordsOperationQueue"];
}
return passwordQueue;
diff -r c6a0c0da810e -r be26860de314 Source/OWSpellingPerContactPlugin.m
--- a/Source/OWSpellingPerContactPlugin.m Tue Apr 05 21:56:32 2011 -0700
+++ b/Source/OWSpellingPerContactPlugin.m Tue Apr 05 22:21:32 2011 -0700
@@ -58,11 +58,7 @@
//Find the first language the user prefers which the spellchecker knows about, then keep it around for future reference
NSArray *preferredLanguages = nil;
- if ([NSApp isOnSnowLeopardOrBetter]) {
- preferredLanguages = [[NSSpellChecker sharedSpellChecker] userPreferredLanguages];
- } else {
- preferredLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
- }
+ preferredLanguages = [[NSSpellChecker sharedSpellChecker] userPreferredLanguages];
for (NSString *language in preferredLanguages) {
if ([[NSSpellChecker sharedSpellChecker] setLanguage:language]) {
diff -r c6a0c0da810e -r be26860de314 test.txt
--- a/test.txt Tue Apr 05 21:56:32 2011 -0700
+++ b/test.txt Tue Apr 05 22:21:32 2011 -0700
@@ -63,4 +63,4 @@
Test
Test
Test
-There Is No Test. Only Zuul.
+There Is No Test. Only Zuul!
diff -r c6a0c0da810e -r be26860de314 xcconfigs/Adium.xcconfig
--- a/xcconfigs/Adium.xcconfig Tue Apr 05 21:56:32 2011 -0700
+++ b/xcconfigs/Adium.xcconfig Tue Apr 05 22:21:32 2011 -0700
@@ -9,6 +9,5 @@
INFOPLIST_PREFIX_HEADER = $(TARGET_BUILD_DIR)/include/PlistMacros.h
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_3) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_4)
-OTHER_CFLAGS = $(CFLAGS) -fno-builtin-strndup
OTHER_LDFLAGS[arch=i386] = -framework QuickTime
OTHER_LDFLAGS[arch=x86_64] = -framework QTKit
diff -r c6a0c0da810e -r be26860de314 xcconfigs/AdiumLibpurple.xcconfig
--- a/xcconfigs/AdiumLibpurple.xcconfig Tue Apr 05 21:56:32 2011 -0700
+++ b/xcconfigs/AdiumLibpurple.xcconfig Tue Apr 05 22:21:32 2011 -0700
@@ -8,7 +8,7 @@
PRODUCT_NAME = AdiumLibpurple
SKIP_INSTALL = YES
DYLIB_CURRENT_VERSION = 1
-OTHER_LDFLAGS = -header-pad_max_install_names -lsasl2
+OTHER_LDFLAGS = -lsasl2
INFOPLIST_FILE = Plists/AdiumLibpurple.plist
DYLIB_COMPATIBILITY_VERSION = 1
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
diff -r c6a0c0da810e -r be26860de314 xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig Tue Apr 05 21:56:32 2011 -0700
+++ b/xcconfigs/Base.xcconfig Tue Apr 05 22:21:32 2011 -0700
@@ -25,7 +25,6 @@
VALID_ARCHS = i386 x86_64
DEBUG_INFORMATION_FORMAT = dwarf
WARNING_CFLAGS = -Wall
-OTHER_LDFLAGS = -Wl -pie
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "$(BUILT_PRODUCTS_DIR)"
GCC_WARN_64_TO_32_BIT_CONVERSION = YES
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
diff -r c6a0c0da810e -r be26860de314 xcconfigs/Spotlight Importer.xcconfig
--- a/xcconfigs/Spotlight Importer.xcconfig Tue Apr 05 21:56:32 2011 -0700
+++ b/xcconfigs/Spotlight Importer.xcconfig Tue Apr 05 22:21:32 2011 -0700
@@ -6,4 +6,3 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO
INSTALL_PATH = /Library/Spotlight
LIBRARY_STYLE = bundle
-OTHER_CFLAGS = ${OTHER_CFLAGS} -fno-builtin-strndup
More information about the commits
mailing list