diff --git a/English.lproj/BasicLanguage.strings b/English.lproj/BasicLanguage.strings index 4f662ee12e..ee6f2ef118 100644 --- a/English.lproj/BasicLanguage.strings +++ b/English.lproj/BasicLanguage.strings @@ -5,8 +5,7 @@ "AccessibilityMemberListDescription" = "User %1$@ selected in member list of channel hash %2$@."; "AddressBookIgnoreEntryType" = "User Ignore"; -"AddressBookUserTrackingEntryType" -= "User Tracking"; +"AddressBookUserTrackingEntryType" = "User Tracking"; "ApplicationWantsToTerminatePromptMessage" = "Quitting will disconnect you from any IRC server that you are connected to until you restart Textual."; "ApplicationWantsToTerminatePromptTitle" = "Do you want to quit Textual?"; @@ -176,7 +175,7 @@ "OpeningLocalStyleResourcesCopyButton" = "Make Local Copy"; "OpeningLocalStyleResourcesMessage" = "The style being opened is a read-only version bundled with Textual."; -"OpeningLocalStyleResourcesTitle" = "Opening Resource Filess"; +"OpeningLocalStyleResourcesTitle" = "Resource Files"; "PluginCommandClashErrorMessage" = "Error: The command %@ is shared by both a script and plugin. Sending to server because of inability to determine priority."; @@ -191,7 +190,7 @@ "ServerDeletePromptMessage" = "There is no undo and all data related to this server will be erased."; "ServerDeletePromptTitle" = "Do you want to delete the selection?"; -"ServerNoticeTreeItemTitle" = "Server Notices"; +"ServerNoticeTreeItemTitle" = "Server Notices"; "ServerSheetAutojoinNavigationTreeItem" = "Autojoin"; "ServerSheetCommandsNavigationTreeItem" = "Connect Commands"; diff --git a/English.lproj/MainMenu.xib b/English.lproj/TXCMainMenu.xib similarity index 100% rename from English.lproj/MainMenu.xib rename to English.lproj/TXCMainMenu.xib diff --git a/Frameworks/Adium/AutoHyperlinks/Source/Hyperlink Processor Framework.xcodeproj/project.pbxproj b/Frameworks/Adium/AutoHyperlinks/Source/Hyperlink Processor Framework.xcodeproj/project.pbxproj index 76fccd9d53..8cada74fe8 100644 --- a/Frameworks/Adium/AutoHyperlinks/Source/Hyperlink Processor Framework.xcodeproj/project.pbxproj +++ b/Frameworks/Adium/AutoHyperlinks/Source/Hyperlink Processor Framework.xcodeproj/project.pbxproj @@ -177,6 +177,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0450; }; buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "Hyperlink Processor Framework" */; compatibilityVersion = "Xcode 3.2"; @@ -233,7 +234,6 @@ DA8A8085085549EE00F24BB3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = NO; }; name = Release; }; @@ -243,6 +243,7 @@ ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -272,6 +273,7 @@ ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = ..; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.h b/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.h index fe47cb3e0c..ebd113a2fd 100644 --- a/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.h +++ b/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.h @@ -25,31 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -typedef void *yyscan_t; -typedef struct AH_buffer_state *AH_BUFFER_STATE; - -extern long AHlex(yyscan_t yyscanner); -extern long AHlex_init(yyscan_t *ptr_yy_globals); -extern long AHlex_destroy(yyscan_t yyscanner); -extern long AHget_leng(yyscan_t scanner); -extern void AHset_in(FILE *in_str, yyscan_t scanner); -extern void AH_switch_to_buffer(AH_BUFFER_STATE, yyscan_t scanner); -extern void AH_delete_buffer(AH_BUFFER_STATE, yyscan_t scanner); -extern YY_EXTRA_TYPE AHget_extra(yyscan_t scanner); -extern AH_BUFFER_STATE AH_scan_string(const char *, yyscan_t scanner); - @interface AHHyperlinkScanner : NSObject -{ - NSDictionary *__weak m_urlSchemes; - NSString *__weak m_scanString; - - BOOL m_strictChecking; - BOOL m_firstCharMismactch; - - unsigned long m_scanLocation; - unsigned long m_scanStringLength; -} - @property (weak, nonatomic, readonly) NSDictionary *urlSchemes; @property (weak, nonatomic, readonly) NSString *scanString; @property (nonatomic, readonly) BOOL strictChecking; diff --git a/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.m b/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.m index 7151354f6f..72e81edda9 100644 --- a/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.m +++ b/Frameworks/Adium/AutoHyperlinks/Source/Source/AHHyperlinkScanner.m @@ -25,6 +25,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +typedef void *yyscan_t; +typedef struct AH_buffer_state *AH_BUFFER_STATE; + +extern long AHlex(yyscan_t yyscanner); +extern long AHlex_init(yyscan_t *ptr_yy_globals); +extern long AHlex_destroy(yyscan_t yyscanner); +extern long AHget_leng(yyscan_t scanner); +extern void AHset_in(FILE *in_str, yyscan_t scanner); +extern void AH_switch_to_buffer(AH_BUFFER_STATE, yyscan_t scanner); +extern void AH_delete_buffer(AH_BUFFER_STATE, yyscan_t scanner); +extern YY_EXTRA_TYPE AHget_extra(yyscan_t scanner); +extern AH_BUFFER_STATE AH_scan_string(const char *, yyscan_t scanner); + #define DEFAULT_URL_SCHEME @"http://" #define ENC_INDEX_KEY @"encIndex" #define ENC_CHAR_KEY @"encChar" @@ -38,6 +51,16 @@ - (BOOL)_scanString:(NSString *)inString upToCharactersFromSet:(NSCharacterSet * @end @implementation AHHyperlinkScanner +{ + NSDictionary *__weak m_urlSchemes; + NSString *__weak m_scanString; + + BOOL m_strictChecking; + BOOL m_firstCharMismactch; + + unsigned long m_scanLocation; + unsigned long m_scanStringLength; +} static NSCharacterSet *skipSet = nil; static NSCharacterSet *endSet = nil; diff --git a/Frameworks/Blowfish/Source/Blowfish Encryption Framework.xcodeproj/project.pbxproj b/Frameworks/Blowfish/Source/Blowfish Encryption Framework.xcodeproj/project.pbxproj index 5e8efe316b..f3e8c18d2d 100644 --- a/Frameworks/Blowfish/Source/Blowfish Encryption Framework.xcodeproj/project.pbxproj +++ b/Frameworks/Blowfish/Source/Blowfish Encryption Framework.xcodeproj/project.pbxproj @@ -303,6 +303,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = BlowfishEncryption_Prefix.pch; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; @@ -329,6 +330,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = BlowfishEncryption_Prefix.pch; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; diff --git a/Frameworks/Blowfish/Source/Classes/DH1080.h b/Frameworks/Blowfish/Source/Classes/DH1080.h index 15446cd0cc..738d598fb4 100644 --- a/Frameworks/Blowfish/Source/Classes/DH1080.h +++ b/Frameworks/Blowfish/Source/Classes/DH1080.h @@ -1,7 +1,5 @@ /* Copyright (c) 2012 Codeux Software */ -#define requiredPublicKeyLength 135 - @interface CFDH1080 : NSObject - (NSString *)generatePublicKey; - (NSString *)secretKeyFromPublicKey:(NSString *)publicKey; diff --git a/Frameworks/Blowfish/Source/Classes/DH1080.mm b/Frameworks/Blowfish/Source/Classes/DH1080.mm index 4527c7a54f..698758ab56 100644 --- a/Frameworks/Blowfish/Source/Classes/DH1080.mm +++ b/Frameworks/Blowfish/Source/Classes/DH1080.mm @@ -3,6 +3,8 @@ #import "DH1080.h" #import "dh1080_be.hpp" +#define requiredPublicKeyLength 135 + @implementation CFDH1080 static dhclass *keyExchanger; diff --git a/Main Project (Textual).xcodeproj/project.pbxproj b/Main Project (Textual).xcodeproj/project.pbxproj index 07503adaf7..89a0268f76 100644 --- a/Main Project (Textual).xcodeproj/project.pbxproj +++ b/Main Project (Textual).xcodeproj/project.pbxproj @@ -159,7 +159,7 @@ 4C46CC84158042C200846B64 /* TVCInputPromptDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC69158042C200846B64 /* TVCInputPromptDialog.xib */; }; 4C46CC85158042C200846B64 /* TDCInviteSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6B158042C200846B64 /* TDCInviteSheet.xib */; }; 4C46CC86158042C200846B64 /* TDCListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6D158042C200846B64 /* TDCListDialog.xib */; }; - 4C46CC87158042C200846B64 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6F158042C200846B64 /* MainMenu.xib */; }; + 4C46CC87158042C200846B64 /* TXCMainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6F158042C200846B64 /* TXCMainMenu.xib */; }; 4C46CC88158042C200846B64 /* TDCModeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC71158042C200846B64 /* TDCModeSheet.xib */; }; 4C46CC89158042C200846B64 /* TDCNickSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC73158042C200846B64 /* TDCNickSheet.xib */; }; 4C46CC8A158042C200846B64 /* TDCPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC75158042C200846B64 /* TDCPreferences.xib */; }; @@ -665,7 +665,7 @@ 4C46CC6A158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TVCInputPromptDialog.xib; sourceTree = SOURCE_ROOT; }; 4C46CC6C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCInviteSheet.xib; sourceTree = SOURCE_ROOT; }; 4C46CC6E158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCListDialog.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC70158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC70158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TXCMainMenu.xib; sourceTree = SOURCE_ROOT; }; 4C46CC72158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCModeSheet.xib; sourceTree = SOURCE_ROOT; }; 4C46CC74158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCNickSheet.xib; sourceTree = SOURCE_ROOT; }; 4C46CC76158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCPreferences.xib; sourceTree = SOURCE_ROOT; }; @@ -1115,7 +1115,7 @@ 4C46CC69158042C200846B64 /* TVCInputPromptDialog.xib */, 4C46CC6B158042C200846B64 /* TDCInviteSheet.xib */, 4C46CC6D158042C200846B64 /* TDCListDialog.xib */, - 4C46CC6F158042C200846B64 /* MainMenu.xib */, + 4C46CC6F158042C200846B64 /* TXCMainMenu.xib */, 4C46CC71158042C200846B64 /* TDCModeSheet.xib */, 4C46CC73158042C200846B64 /* TDCNickSheet.xib */, 4C46CC75158042C200846B64 /* TDCPreferences.xib */, @@ -1797,7 +1797,7 @@ 4C46CC84158042C200846B64 /* TVCInputPromptDialog.xib in Resources */, 4C46CC85158042C200846B64 /* TDCInviteSheet.xib in Resources */, 4C46CC86158042C200846B64 /* TDCListDialog.xib in Resources */, - 4C46CC87158042C200846B64 /* MainMenu.xib in Resources */, + 4C46CC87158042C200846B64 /* TXCMainMenu.xib in Resources */, 4C46CC88158042C200846B64 /* TDCModeSheet.xib in Resources */, 4C46CC89158042C200846B64 /* TDCNickSheet.xib in Resources */, 4C46CC8A158042C200846B64 /* TDCPreferences.xib in Resources */, @@ -2132,12 +2132,12 @@ name = TDCListDialog.xib; sourceTree = ""; }; - 4C46CC6F158042C200846B64 /* MainMenu.xib */ = { + 4C46CC6F158042C200846B64 /* TXCMainMenu.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC70158042C200846B64 /* English */, ); - name = MainMenu.xib; + name = TXCMainMenu.xib; sourceTree = ""; }; 4C46CC71158042C200846B64 /* TDCModeSheet.xib */ = { @@ -2309,10 +2309,13 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; + IBC_WARNINGS = NO; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; + INFOPLIST_OUTPUT_FORMAT = binary; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; + STRINGS_FILE_OUTPUT_ENCODING = binary; STRIPFLAGS = "-S"; STRIP_STYLE = "non-global"; TEXTUAL_BUNDLE_ID = ""; @@ -2349,10 +2352,13 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; + IBC_WARNINGS = NO; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; + INFOPLIST_OUTPUT_FORMAT = binary; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; + STRINGS_FILE_OUTPUT_ENCODING = binary; STRIPFLAGS = "-S"; STRIP_STYLE = "non-global"; TEXTUAL_BUNDLE_ID = ""; @@ -2411,10 +2417,13 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; + IBC_WARNINGS = NO; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; + INFOPLIST_OUTPUT_FORMAT = binary; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; + STRINGS_FILE_OUTPUT_ENCODING = binary; STRIPFLAGS = "-S"; STRIP_STYLE = "non-global"; TEXTUAL_BUNDLE_ID = ""; @@ -2463,10 +2472,13 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; + IBC_WARNINGS = NO; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; + INFOPLIST_OUTPUT_FORMAT = binary; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; + STRINGS_FILE_OUTPUT_ENCODING = binary; STRIPFLAGS = "-S"; STRIP_STYLE = "non-global"; TEXTUAL_BUNDLE_ID = ""; @@ -2515,10 +2527,13 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; + IBC_WARNINGS = NO; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; + INFOPLIST_OUTPUT_FORMAT = binary; MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; + STRINGS_FILE_OUTPUT_ENCODING = binary; STRIPFLAGS = "-S"; STRIP_STYLE = "non-global"; TEXTUAL_BUNDLE_ID = ""; diff --git a/Resources/Miscellaneous/Info.plist b/Resources/Miscellaneous/Info.plist index 8e3151ce9b..d21a4dd6b7 100755 --- a/Resources/Miscellaneous/Info.plist +++ b/Resources/Miscellaneous/Info.plist @@ -3,9 +3,9 @@ Build Number - 10437 + 10441 Build Reference - 2.1.1-124-gbc3754f-stdbuild + 2.1.1-125-g04dc1d1-stdbuild CFBundleExecutable Textual CFBundleIconFile @@ -20,8 +20,6 @@ APPL CFBundleShortVersionString 2.1.1 - CFBundleSignature - TXTL CFBundleURLTypes @@ -47,7 +45,7 @@ NSHumanReadableCopyright Copyright © 2010, 2011, 2012 Codeux Software NSMainNibFile - MainMenu + TXCMainMenu NSPrincipalClass NSApplication diff --git a/Textual.entitlements b/Textual.entitlements index d2e1795675..f01920c087 100644 --- a/Textual.entitlements +++ b/Textual.entitlements @@ -6,6 +6,8 @@ com.apple.security.network.client + com.apple.security.temporary-exception.files.home-relative-path.read-write + /Library/Containers/com.codeux.irc.textual/ com.apple.security.temporary-exception.apple-events com.apple.systemevents