adium 5803:c81529c93fea: Fix some object subscripting issues.
commits at adium.im
commits at adium.im
Sun Dec 8 18:33:53 UTC 2013
details: http://hg.adium.im/adium/rev/c81529c93fea
revision: 5803:c81529c93fea
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Dec 08 11:29:25 2013 -0500
Fix some object subscripting issues.
Subject: adium 5804:403a083de01b: Use a shared directory for PlistMacros.h.
details: http://hg.adium.im/adium/rev/403a083de01b
revision: 5804:403a083de01b
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Dec 08 13:33:23 2013 -0500
Use a shared directory for PlistMacros.h.
diffs (58 lines):
diff -r 9a8643d5b679 -r 403a083de01b Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sat Dec 07 15:37:41 2013 -0500
+++ b/Adium.xcodeproj/project.pbxproj Sun Dec 08 13:33:23 2013 -0500
@@ -10119,7 +10119,7 @@
files = (
);
inputPaths = (
- $TARGET_BUILD_DIR/include/PlistMacros.h,
+ "$(CONFIGURATION_TEMP_DIR)/include/PlistMacros.h",
"$(SRCROOT)/Plists/buildnum",
);
name = "Run Generate Buildnum File Script";
@@ -10176,8 +10176,8 @@
inputPaths = (
);
outputPaths = (
- "$(TARGET_BUILD_DIR)/include/PlistMacros.h",
- "$(TARGET_BUILD_DIR)/include/DummyFileToForceScriptToRunEveryTimeWithoutBeingCreated",
+ "$(CONFIGURATION_TEMP_DIR)/include/PlistMacros.h",
+ "$(CONFIGURATION_TEMP_DIR)/include/DummyFileToForceScriptToRunEveryTimeWithoutBeingCreated",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
diff -r 9a8643d5b679 -r 403a083de01b Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m Sat Dec 07 15:37:41 2013 -0500
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m Sun Dec 08 13:33:23 2013 -0500
@@ -201,7 +201,7 @@
[[(NetNewsWireApplication *)sbapp titlesOfTabs] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
//Skip the "News" item
if (idx == 0) return;
- [menuItems addObject:[[[NSMenuItem alloc] initWithTitle:obj target:self action:@selector(addLink:) keyEquivalent:@"" representedObject:urls[idx]] autorelease]];
+ [menuItems addObject:[[[NSMenuItem alloc] initWithTitle:obj target:self action:@selector(addLink:) keyEquivalent:@"" representedObject:[urls objectAtIndex:idx]] autorelease]];
}];
[openTabs setObject:menuItems forKey:@"NetNewsWire"];
@@ -258,8 +258,8 @@
//Make sure we support this browser
NSDictionary *browser = [BROWSER_ACTIVE_TAB_KEY_PATHS objectForKey:bundleID];
if (browser) {
- [SHLinkEditorWindowController insertLinkTo:[NSURL URLWithString:[sbapp valueForKeyPath:browser[@"URL"]]]
- withText:[sbapp valueForKeyPath:browser[@"title"]]
+ [SHLinkEditorWindowController insertLinkTo:[NSURL URLWithString:[sbapp valueForKeyPath:[browser objectForKey:@"URL"]]]
+ withText:[sbapp valueForKeyPath:[browser objectForKey:@"title"]]
inView:earliestTextView];
}
}
diff -r 9a8643d5b679 -r 403a083de01b xcconfigs/Adium.xcconfig
--- a/xcconfigs/Adium.xcconfig Sat Dec 07 15:37:41 2013 -0500
+++ b/xcconfigs/Adium.xcconfig Sun Dec 08 13:33:23 2013 -0500
@@ -7,7 +7,7 @@
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = -C
INFOPLIST_PREPROCESS = YES
INFOPLIST_FILE = Plists/Info.plist
-INFOPLIST_PREFIX_HEADER = $(TARGET_BUILD_DIR)/include/PlistMacros.h
+INFOPLIST_PREFIX_HEADER = $(CONFIGURATION_TEMP_DIR)/include/PlistMacros.h
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_3) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_4) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_6) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_7)
OTHER_LDFLAGS[arch=i386] = -framework QuickTime
More information about the commits
mailing list