From e4e2174d5c3bca55126c23d02ef2e1feeec2ef8c Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Fri, 14 Dec 2007 02:31:48 +0000 Subject: [PATCH] 352451 Console spew related to RSS. Take advantage of build revision that links preference panes against the main executable with -bundle_loader. v2, contains a workaround to prevent Xcode 2.x's ld from dead-stripping the critical .objc_class_name_* symbol. r=ardissone sr=smorgan a/1.6b1=me git-svn-id: svn://10.0.0.236/trunk@241205 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Camino.xcodeproj/project.pbxproj | 2 -- .../Navigation/English.lproj/Localizable.strings.in | 1 - mozilla/camino/src/browser/AppListMenuFactory.mm | 11 ++++++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/camino/Camino.xcodeproj/project.pbxproj b/mozilla/camino/Camino.xcodeproj/project.pbxproj index 4b7be792c50..a186984aeef 100644 --- a/mozilla/camino/Camino.xcodeproj/project.pbxproj +++ b/mozilla/camino/Camino.xcodeproj/project.pbxproj @@ -1252,7 +1252,6 @@ DE74F7550AB25EDA00FD1D5B /* FeedServiceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = DE74F7540AB25EDA00FD1D5B /* FeedServiceController.mm */; }; DE74F7560AB25EDA00FD1D5B /* FeedServiceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = DE74F7540AB25EDA00FD1D5B /* FeedServiceController.mm */; }; DE74F75D0AB2605B00FD1D5B /* AppListMenuFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = DE74F74A0AB25E9900FD1D5B /* AppListMenuFactory.h */; }; - DE74F75F0AB2609400FD1D5B /* AppListMenuFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = DE74F7470AB25E7D00FD1D5B /* AppListMenuFactory.mm */; }; DE74F7620AB2612700FD1D5B /* OpenFeed.nib in Resources */ = {isa = PBXBuildFile; fileRef = DE74F7600AB2612700FD1D5B /* OpenFeed.nib */; }; DE74F7630AB2612700FD1D5B /* OpenFeed.nib in Resources */ = {isa = PBXBuildFile; fileRef = DE74F7600AB2612700FD1D5B /* OpenFeed.nib */; }; DE74F7650AB2618200FD1D5B /* feed.tif in Resources */ = {isa = PBXBuildFile; fileRef = DE74F7640AB2618200FD1D5B /* feed.tif */; }; @@ -5822,7 +5821,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DE74F75F0AB2609400FD1D5B /* AppListMenuFactory.mm in Sources */, 3F44ADAA05BDFB9F00CB4B08 /* Navigation.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in index c40673ab1a9..dcac2741caa 100644 --- a/mozilla/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in +++ b/mozilla/camino/PreferencePanes/Navigation/English.lproj/Localizable.strings.in @@ -1,2 +1 @@ "PreferencePanelLabel" = "General"; -"Select..." = "Select…"; diff --git a/mozilla/camino/src/browser/AppListMenuFactory.mm b/mozilla/camino/src/browser/AppListMenuFactory.mm index a431b818636..8fd223fd411 100644 --- a/mozilla/camino/src/browser/AppListMenuFactory.mm +++ b/mozilla/camino/src/browser/AppListMenuFactory.mm @@ -39,9 +39,14 @@ #import "AppListMenuFactory.h" #import "NSWorkspace+Utils.h" -NSString* const kUserChosenBrowserUserDefaultsKey = @"UserChosenBrowsers"; -NSString* const kUserChosenFeedViewerUserDefaultsKey = @"UserChosenFeedViewer"; -NSString* const kDefaultFeedViewerChanged = @"DefaultFeedViewerChanged"; +#pragma GCC visibility push(default) +// Xcode 2.x's ld dead-strips this symbol. Xcode 3.0's ld is fine. +asm(".no_dead_strip .objc_class_name_AppListMenuFactory"); + +__attribute__((used)) NSString* const kUserChosenBrowserUserDefaultsKey = @"UserChosenBrowsers"; +__attribute__((used)) NSString* const kUserChosenFeedViewerUserDefaultsKey = @"UserChosenFeedViewer"; +__attribute__((used)) NSString* const kDefaultFeedViewerChanged = @"DefaultFeedViewerChanged"; +#pragma GCC visibility pop @interface AppListMenuFactory(Private)