adium 5846:498ee4bba810: Fixed or suppressed as appropriate a do...
commits at adium.im
commits at adium.im
Tue Mar 11 03:36:52 UTC 2014
details: http://hg.adium.im/adium/rev/498ee4bba810
revision: 5846:498ee4bba810
branch: (none)
author: Evan Schoenberg
date: Mon Mar 10 23:36:48 2014 -0400
Fixed or suppressed as appropriate a double handful of warnings new in XCode 5.1.
diffs (644 lines):
diff -r 28f9ae843142 -r 498ee4bba810 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Mon Feb 03 21:00:54 2014 -0500
+++ b/Adium.xcodeproj/project.pbxproj Mon Mar 10 23:36:48 2014 -0400
@@ -1043,7 +1043,6 @@
5A6298DF1682BD9100F51DED /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
5A6298E31682BD9D00F51DED /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
- 5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */; };
5A914166175BD960002139D5 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A914164175BD960002139D5 /* ISO8601DateFormatter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A914167175BD960002139D5 /* ISO8601DateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A914165175BD960002139D5 /* ISO8601DateFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
5A914168175BD97F002139D5 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A914164175BD960002139D5 /* ISO8601DateFormatter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -1363,9 +1362,9 @@
76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */; };
76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */; };
76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */; };
- 76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76B73B2014BE287D00A58BAB /* Foundation.framework */; };
- 76B73B3014BE29AB00A58BAB /* im.adium.AIApplescriptRunner.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */; };
- 76B73B3414BE3B9400A58BAB /* AIApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */; };
+ 76B73B2114BE287D00A58BAB /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+ 76B73B3014BE29AB00A58BAB /* (null) in CopyFiles */ = {isa = PBXBuildFile; };
+ 76B73B3414BE3B9400A58BAB /* (null) in Sources */ = {isa = PBXBuildFile; };
76B8B8EC16AF3A46009126FE /* AIOTRTopBarLoggingWarningController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B8B8EA16AF3A46009126FE /* AIOTRTopBarLoggingWarningController.m */; };
76B8B8ED16AF3A46009126FE /* AIOTRTopBarLoggingWarningController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76B8B8EB16AF3A46009126FE /* AIOTRTopBarLoggingWarningController.xib */; };
76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
@@ -1762,7 +1761,7 @@
dstPath = Contents/XPCServices;
dstSubfolderSpec = 1;
files = (
- 76B73B3014BE29AB00A58BAB /* im.adium.AIApplescriptRunner.xpc in CopyFiles */,
+ 76B73B3014BE29AB00A58BAB /* (null) in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4908,7 +4907,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */,
+ 76B73B2114BE287D00A58BAB /* (null) in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5115,7 +5114,6 @@
312ED3CA0C7E875B00A6BDA9 /* Unit tests.octest */,
6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */,
633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */,
- 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */,
761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */,
);
name = Products;
@@ -8255,8 +8253,6 @@
76B73B2214BE287D00A58BAB /* AIApplescriptRunner */ = {
isa = PBXGroup;
children = (
- 76B73B3514BE3BEB00A58BAB /* AIApplescriptRunner-Info.plist */,
- 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */,
);
path = AIApplescriptRunner;
sourceTree = "<group>";
@@ -9495,7 +9491,6 @@
);
name = AIApplescriptRunner;
productName = AIApplescriptRunner;
- productReference = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
@@ -9506,7 +9501,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AI;
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0510;
ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
@@ -10874,7 +10869,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 76B73B3414BE3B9400A58BAB /* AIApplescriptRunner.m in Sources */,
+ 76B73B3414BE3B9400A58BAB /* (null) in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -12536,7 +12531,6 @@
baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -12569,7 +12563,6 @@
baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -12603,7 +12596,6 @@
baseConfigurationReference = 5A4B77FA16FCABEC00DF398C /* Dock Tile Plugin.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -12636,7 +12628,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
@@ -12677,7 +12668,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -12703,7 +12693,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -12794,6 +12783,9 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
};
@@ -12801,6 +12793,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
};
name = Release;
};
@@ -12808,6 +12802,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
};
name = "Release-Debug";
};
diff -r 28f9ae843142 -r 498ee4bba810 Adium.xcodeproj/xcshareddata/xcschemes/Adium.xcscheme
--- a/Adium.xcodeproj/xcshareddata/xcschemes/Adium.xcscheme Mon Feb 03 21:00:54 2014 -0500
+++ b/Adium.xcodeproj/xcshareddata/xcschemes/Adium.xcscheme Mon Mar 10 23:36:48 2014 -0400
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0500"
+ LastUpgradeVersion = "0510"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
diff -r 28f9ae843142 -r 498ee4bba810 Dependencies/patches/gettext-Makefile.in.diff
--- a/Dependencies/patches/gettext-Makefile.in.diff Mon Feb 03 21:00:54 2014 -0500
+++ b/Dependencies/patches/gettext-Makefile.in.diff Mon Mar 10 23:36:48 2014 -0400
@@ -3,9 +3,9 @@
@@ -1248,7 +1248,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles m4
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects m4
# Allow users to use "gnulib-tool --update".
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AICompletingTextField.m
--- a/Frameworks/AIUtilities Framework/Source/AICompletingTextField.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AICompletingTextField.m Mon Mar 10 23:36:48 2014 -0400
@@ -41,7 +41,7 @@
*/
@interface AICompletingTextField ()
-- (id)_init;
+- (void)_initCompletingTextField;
- (NSString *)completionForString:(NSString *)inString;
@end
@@ -51,7 +51,7 @@
- (id)initWithCoder:(NSCoder *)aDecoder
{
if ((self = [super initWithCoder:aDecoder])) {
- [self _init];
+ [self _initCompletingTextField];
}
return self;
}
@@ -59,20 +59,18 @@
- (id)initWithFrame:(NSRect)frameRect
{
if ((self = [super initWithFrame:frameRect])) {
- [self _init];
+ [self _initCompletingTextField];
}
return self;
}
-- (id)_init
+- (void)_initCompletingTextField
{
stringSet = nil;
impliedCompletionDictionary = nil;
minLength = 1;
oldUserLength = 0;
completeAfterSeparator = NO;
-
- return self;
}
//Sets the minimum string length required before completion kicks in
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Mon Mar 10 23:36:48 2014 -0400
@@ -353,11 +353,11 @@
minutesString = [NSString stringWithFormat: @"%lim",minutes];
secondsString = [NSString stringWithFormat: @"%.0fs",seconds];
} else {
- weeksString = (weeks == 1) ? ONE_WEEK : [NSString stringWithFormat:MULTIPLE_WEEKS, weeks];
- daysString = (days == 1) ? ONE_DAY : [NSString stringWithFormat:MULTIPLE_DAYS, days];
- hoursString = (hours == 1) ? ONE_HOUR : [NSString stringWithFormat:MULTIPLE_HOURS, hours];
- minutesString = (minutes == 1) ? ONE_MINUTE : [NSString stringWithFormat:MULTIPLE_MINUTES, minutes];
- secondsString = (seconds == 1) ? ONE_SECOND : [NSString stringWithFormat:MULTIPLE_SECONDS, seconds];
+ weeksString = (weeks == 1) ? ONE_WEEK : [NSString stringWithFormat:MULTIPLE_WEEKS, (int)weeks];
+ daysString = (days == 1) ? ONE_DAY : [NSString stringWithFormat:MULTIPLE_DAYS, (int)days];
+ hoursString = (hours == 1) ? ONE_HOUR : [NSString stringWithFormat:MULTIPLE_HOURS, (int)hours];
+ minutesString = (minutes == 1) ? ONE_MINUTE : [NSString stringWithFormat:MULTIPLE_MINUTES, (int)minutes];
+ secondsString = (seconds == 1) ? ONE_SECOND : [NSString stringWithFormat:MULTIPLE_SECONDS, (int)seconds];
}
//assemble the parts
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AIDelayedTextField.m
--- a/Frameworks/AIUtilities Framework/Source/AIDelayedTextField.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIDelayedTextField.m Mon Mar 10 23:36:48 2014 -0400
@@ -19,7 +19,7 @@
// A text field that groups changes, sending its action to its target when 0.5 seconds elapses without a change
@interface AIDelayedTextField ()
-- (id)_init;
+- (void)_initDelayedTextField;
@end
@implementation AIDelayedTextField
@@ -28,7 +28,7 @@
- (id)initWithCoder:(NSCoder *)aDecoder
{
if ((self = [super initWithCoder:aDecoder])) {
- self = [self _init];
+ [self _initDelayedTextField];
}
return self;
}
@@ -36,16 +36,14 @@
- (id)initWithFrame:(NSRect)frame
{
if ((self = [super initWithFrame:frame])) {
- [self _init];
+ [self _initDelayedTextField];
}
return self;
}
-- (id)_init
+- (void)_initDelayedTextField
{
delayInterval = 0.5f;
-
- return self;
}
- (void)setDelayInterval:(float)inInterval
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.h
--- a/Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.h Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.h Mon Mar 10 23:36:48 2014 -0400
@@ -24,7 +24,7 @@
*/
@interface AIHighlightingTextField : NSTextField
{
- BOOL selected;
+ BOOL _selected;
__weak AIPreferencePane *pane;
}
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m
--- a/Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m Mon Mar 10 23:36:48 2014 -0400
@@ -18,7 +18,7 @@
@implementation AIHighlightingTextField
- at synthesize selected, pane;
+ at synthesize selected = _selected, pane;
- (id)initWithFrame:(NSRect)frameRect
{
@@ -42,6 +42,8 @@
[self setDrawsBackground:NO];
[self setTextColor:[NSColor textColor]];
}
+
+ _selected = newSelected;
}
/*!
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AIUtilities Framework/Source/AIStringFormatter.m
--- a/Frameworks/AIUtilities Framework/Source/AIStringFormatter.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIStringFormatter.m Mon Mar 10 23:36:48 2014 -0400
@@ -111,9 +111,12 @@
errorCount++;
if (errorMessage != nil && errorCount > ERRORS_BEFORE_DIALOG) {
- NSRunAlertPanel(AILocalizedStringFromTableInBundle(@"Invalid Input",nil, [NSBundle bundleWithIdentifier:AIUTILITIES_BUNDLE_ID], nil),
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
+ NSRunAlertPanel(AILocalizedStringFromTableInBundle(@"Invalid Input",nil, [NSBundle bundleWithIdentifier:AIUTILITIES_BUNDLE_ID], nil),
errorMessage,
AILocalizedStringFromTableInBundle(@"OK", nil, [NSBundle bundleWithIdentifier:AIUTILITIES_BUNDLE_ID], nil), nil, nil);
+#pragma GCC diagnostic pop
errorCount = 0;
} else {
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m
--- a/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Mon Mar 10 23:36:48 2014 -0400
@@ -74,7 +74,9 @@
contact = [adium.contactController contactWithService:account.service
account:account
UID:UID];
- } else {
+ } else {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunAlertPanel(AILocalizedStringFromTableInBundle(@"Contact not found",
nil,
[NSBundle bundleForClass:[AIAccountPlusFieldPromptController class]],
@@ -90,7 +92,7 @@
nil),
nil,
nil);
-
+#pragma GCC diagnostic pop
return nil;
}
} else {
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Mon Mar 10 23:36:48 2014 -0400
@@ -1454,7 +1454,7 @@
if (!success)
- NSRunAlertPanel(CONTACT_ADDED_ERROR_TITLE, CONTACT_ADDED_ERROR_Message, nil, nil, nil);
+ NSRunAlertPanel(CONTACT_ADDED_ERROR_TITLE, CONTACT_ADDED_ERROR_Message, nil, nil, nil, contact.displayName);
}
@end
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AICorePluginLoader.m
--- a/Frameworks/Adium Framework/Source/AICorePluginLoader.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AICorePluginLoader.m Mon Mar 10 23:36:48 2014 -0400
@@ -183,6 +183,8 @@
if ((pluginBundle = [NSBundle bundleWithPath:pluginPath])) {
if ([self pluginIsBlacklisted:pluginBundle]) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunInformationalAlertPanel([NSString stringWithFormat:
AILocalizedString(@"Plugin %@ Will be Disabled", "%@ will be the name of a plugin. This is the title of the dialogue shown when an plugin is blacklisted."),
[[pluginPath lastPathComponent] stringByDeletingPathExtension]],
@@ -192,6 +194,7 @@
AILocalizedString(@"Disable", nil),
nil,
nil);
+#pragma GCC diagnostic pop
[self moveXtra:pluginPath toDisabledFolder:YES];
return;
}
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AISoundSet.m
--- a/Frameworks/Adium Framework/Source/AISoundSet.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AISoundSet.m Mon Mar 10 23:36:48 2014 -0400
@@ -126,11 +126,14 @@
toPath:[newFolder stringByAppendingPathComponent:[inPath lastPathComponent]]
error:NULL];
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunAlertPanel(AILocalizedString(@"Sound set upgrade failed", nil),
[NSString stringWithFormat:AILocalizedString(@"This version of Adium uses a new format for sound sets. Adium was not able to update the sound set %@ located at %@. It has been disabled.", nil),
[[inPath lastPathComponent] stringByDeletingPathExtension],
inPath],
nil, nil, nil);
+#pragma GCC diagnostic pop
success = NO;
}
}
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AIStatusIcons.m
--- a/Frameworks/Adium Framework/Source/AIStatusIcons.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AIStatusIcons.m Mon Mar 10 23:36:48 2014 -0400
@@ -165,7 +165,8 @@
} else {
NSString *errorMessage;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
errorMessage = [NSString stringWithFormat:
AILocalizedString(@"The active status icon pack \"%@\" installed at \"%@\" is invalid. It is missing the required status icon \"%@\". If you received this pack from xtras.adium.im, please contact its author. Your status icon setting will be restored to the default.", nil),
[[statusIconBasePath lastPathComponent] stringByDeletingPathExtension],
@@ -173,7 +174,7 @@
defaultStatusName];
NSRunCriticalAlertPanel(AILocalizedString(@"Invalid status icon pack", nil),errorMessage,nil,nil,nil);
-
+#pragma GCC diagnostic pop
//Post a notification so someone, somewhere can fix us :)
[[NSNotificationCenter defaultCenter] postNotificationName:AIStatusIconSetInvalidSetNotification
object:nil];
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/Adium Framework/Source/AdiumAuthorization.m
--- a/Frameworks/Adium Framework/Source/AdiumAuthorization.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/Adium Framework/Source/AdiumAuthorization.m Mon Mar 10 23:36:48 2014 -0400
@@ -185,7 +185,7 @@
forChat:(AIChat *)chat
withCount:(NSUInteger)count
{
- return [NSString stringWithFormat:AILocalizedString(@"%u authorization requests", nil), count];
+ return [NSString stringWithFormat:AILocalizedString(@"%u authorization requests", nil), (unsigned)count];
}
@end
diff -r 28f9ae843142 -r 498ee4bba810 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Mon Feb 03 21:00:54 2014 -0500
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Mon Mar 10 23:36:48 2014 -0400
@@ -399,7 +399,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AH;
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0510;
ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
@@ -627,6 +627,9 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF31B11769FE700EDC305 /* Release-Debug.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
};
name = "Release-Debug";
};
@@ -891,6 +894,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF30C11769F4C00EDC305 /* Debug.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
};
@@ -898,6 +905,9 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF31811769FBD00EDC305 /* Release.xcconfig */;
buildSettings = {
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
};
name = Release;
};
diff -r 28f9ae843142 -r 498ee4bba810 Other/Adium Crash Reporter/AICrashReporter.m
--- a/Other/Adium Crash Reporter/AICrashReporter.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Other/Adium Crash Reporter/AICrashReporter.m Mon Mar 10 23:36:48 2014 -0400
@@ -169,6 +169,8 @@
//Check for success and offer to try once more if there was an error sending
if ([response statusCode] != 201) {
NSString *reason = [NSString stringWithFormat:@"%lu: %@\n%@", response.statusCode, [NSHTTPURLResponse localizedStringForStatusCode:response.statusCode], [error localizedDescription] ?: @""];
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
if (NSRunAlertPanel(UNABLE_TO_SEND,
reason,
AILocalizedString(@"Try Again", nil),
@@ -180,6 +182,7 @@
NSRunAlertPanel(UNABLE_TO_SEND, reason, nil, nil, nil);
}
}
+#pragma GCC diagnostic pop
}
}
diff -r 28f9ae843142 -r 498ee4bba810 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Mon Mar 10 23:36:48 2014 -0400
@@ -414,7 +414,7 @@
{
[alert setInformativeText:[NSString stringWithFormat:
AILocalizedString(@"Send Later will send the message the next time both you and %@ are online. Send Now may work if %@ is invisible or is not on your contact list and so only appears to be offline.", "Send Later dialogue explanation text"),
- formattedUID, formattedUID, formattedUID]];
+ formattedUID, formattedUID]];
[alert addButtonWithTitle:AILocalizedString(@"Send Now", nil)];
[alert addButtonWithTitle:AILocalizedString(@"Send Later", nil)];
@@ -427,7 +427,7 @@
{
[alert setInformativeText:[NSString stringWithFormat:
AILocalizedString(@"Send Later will send the message the next time both you and %@ are online.", "Send Later dialogue explanation text"),
- formattedUID, formattedUID, formattedUID]];
+ formattedUID]];
[alert addButtonWithTitle:AILocalizedString(@"Send Later", nil)];
[[[alert buttons] objectAtIndex:0] setKeyEquivalent:@"l"];
[[[alert buttons] objectAtIndex:0] setKeyEquivalentModifierMask:0];
diff -r 28f9ae843142 -r 498ee4bba810 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Mon Mar 10 23:36:48 2014 -0400
@@ -365,11 +365,14 @@
- (IBAction)showDetails:(id)sender
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunInformationalAlertPanel(AILocalizedString(@"Details",nil),
[[adium.interfaceController.activeChat securityDetails] objectForKey:@"Description"],
AILocalizedString(@"OK",nil),
nil,
nil);
+#pragma GCC diagnostic pop
}
- (IBAction)verify:(id)sender
@@ -400,11 +403,14 @@
aboutEncryption = adium.interfaceController.activeChat.account.aboutEncryption;
if (aboutEncryption) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunInformationalAlertPanel(AILocalizedString(@"About Encryption",nil),
aboutEncryption,
AILocalizedString(@"OK",nil),
nil,
nil);
+#pragma GCC diagnostic pop
}
}
diff -r 28f9ae843142 -r 498ee4bba810 Source/AIAdium.m
--- a/Source/AIAdium.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Source/AIAdium.m Mon Mar 10 23:36:48 2014 -0400
@@ -644,9 +644,12 @@
[[NSNotificationCenter defaultCenter] postNotificationName:AIXtrasDidChangeNotification
object:[[filename lastPathComponent] pathExtension]];
-
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
buttonPressed = NSRunInformationalAlertPanel(alertTitle,alertMsg,nil,prefsButton,nil);
-
+#pragma GCC diagnostic pop
+
// User clicked the "open prefs" button
if (buttonPressed == NSAlertAlternateReturn) {
//If we're done loading the app, open the prefs now; if not, it'll be done once the load is finished
@@ -665,9 +668,12 @@
errorMessage = AILocalizedString(@"An error occurred while installing the X(tra).",nil);
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
NSRunAlertPanel(AILocalizedString(@"Installation Failed","Title of installation failed window"),
errorMessage,
nil,nil,nil);
+#pragma GCC diagnostic pop
}
return success;
diff -r 28f9ae843142 -r 498ee4bba810 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Source/AILogViewerWindowController.m Mon Mar 10 23:36:48 2014 -0400
@@ -541,13 +541,13 @@
[resultsLock lock];
NSUInteger count = [currentSearchResults count];
if (activeSearchString && [activeSearchString length]) {
- [textField_resultCount setStringValue:[NSString stringWithFormat:((count != 1) ?
- AILocalizedString(@"%lu matching transcripts",nil) :
- AILocalizedString(@"1 matching transcript",nil)),count]];
+ [textField_resultCount setStringValue:((count != 1) ?
+ [NSString stringWithFormat:AILocalizedString(@"%lu matching transcripts",nil),count] :
+ AILocalizedString(@"1 matching transcript",nil))];
} else {
- [textField_resultCount setStringValue:[NSString stringWithFormat:((count != 1) ?
- AILocalizedString(@"%lu transcripts",nil) :
- AILocalizedString(@"1 transcript",nil)),count]];
+ [textField_resultCount setStringValue:((count != 1) ?
+ [NSString stringWithFormat:AILocalizedString(@"%lu transcripts",nil),count] :
+ AILocalizedString(@"1 transcript",nil))];
//We are searching, but there is no active search string. This indicates we're still opening logs.
if (searching) {
diff -r 28f9ae843142 -r 498ee4bba810 Source/AdiumChatEvents.m
--- a/Source/AdiumChatEvents.m Mon Feb 03 21:00:54 2014 -0500
+++ b/Source/AdiumChatEvents.m Mon Mar 10 23:36:48 2014 -0400
@@ -194,8 +194,7 @@
} else if ([eventID isEqualToString:CONTENT_CONTACT_LEFT_CHAT]) {
description = [NSString stringWithFormat:
AILocalizedString(@"%@ invites you to a group chat","Contact invites you to a group chat"),
- listObject.displayName,
- chat.displayName];
+ listObject.displayName];
} else if ([eventID isEqualToString:CONTENT_GROUP_CHAT_MENTION]) {
description = [NSString stringWithFormat:
AILocalizedString(@"%@ mentioned you in %@","Someone mentions your name in a group chat"),
@@ -214,9 +213,7 @@
AILocalizedString(@"left %@","Contact left Chat Name"),
chat.displayName];
} else if ([eventID isEqualToString:CONTENT_GROUP_CHAT_INVITE]) {
- description = [NSString stringWithFormat:
- AILocalizedString(@"invites you to a group chat","Contact left Chat Name"),
- chat.displayName];
+ description = AILocalizedString(@"invites you to a group chat","Contact invites you to a group chat");
} else if ([eventID isEqualToString:CONTENT_GROUP_CHAT_MENTION]) {
description = [NSString stringWithFormat:
AILocalizedString(@"you were mentioned in %@","Someone mentions your name in a group chat"),
More information about the commits
mailing list