adium 5154:162d0f9e351f: Fix or silence a lot of warnings for Xc...
commits at adium.im
commits at adium.im
Sat Oct 20 19:23:30 UTC 2012
details: http://hg.adium.im/adium/rev/162d0f9e351f
revision: 5154:162d0f9e351f
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat Oct 20 21:16:28 2012 +0200
Fix or silence a lot of warnings for Xcode 4.5.
diffs (truncated from 1437 to 1000 lines):
diff -r bd88932e1080 -r 162d0f9e351f Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sat Oct 20 14:15:20 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Sat Oct 20 21:16:28 2012 +0200
@@ -9310,7 +9310,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AI;
- LastUpgradeCheck = 0430;
+ LastUpgradeCheck = 0450;
ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
@@ -12182,6 +12182,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12189,6 +12190,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12196,6 +12198,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12203,6 +12206,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12214,6 +12218,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12225,6 +12230,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12257,6 +12263,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12264,6 +12271,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12271,6 +12279,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12278,6 +12287,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12285,6 +12295,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12292,6 +12303,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12299,6 +12311,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12306,6 +12319,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12313,6 +12327,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12320,6 +12335,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12327,6 +12343,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12334,6 +12351,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12341,6 +12359,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12354,6 +12373,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12368,6 +12388,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12406,6 +12427,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = Debug;
@@ -12414,6 +12436,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = Release;
@@ -12422,6 +12445,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = "Release-Debug";
@@ -12430,6 +12454,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12437,6 +12462,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12444,6 +12470,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIAttributedStringAdditions.m Sat Oct 20 21:16:28 2012 +0200
@@ -289,7 +289,7 @@
if ([self length] && [self containsAttachments]) {
NSInteger currentLocation = 0;
NSRange attachmentRange;
- NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",NSAttachmentCharacter];
+ NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",(unsigned short)NSAttachmentCharacter];
//find attachment
attachmentRange = [[self string] rangeOfString:attachmentCharacterString
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m Sat Oct 20 21:16:28 2012 +0200
@@ -355,10 +355,10 @@
//build the strings for the parts
if (abbreviate) {
//Note: after checking with a linguistics student, it appears that we're fine leaving it as w, h, etc... rather than localizing.
- weeksString = [NSString stringWithFormat: @"%iw",weeks];
- daysString = [NSString stringWithFormat: @"%id",days];
- hoursString = [NSString stringWithFormat: @"%ih",hours];
- minutesString = [NSString stringWithFormat: @"%im",minutes];
+ weeksString = [NSString stringWithFormat: @"%liw",weeks];
+ daysString = [NSString stringWithFormat: @"%lid",days];
+ hoursString = [NSString stringWithFormat: @"%lih",hours];
+ minutesString = [NSString stringWithFormat: @"%lim",minutes];
secondsString = [NSString stringWithFormat: @"%.0fs",seconds];
} else {
weeksString = (weeks == 1) ? ONE_WEEK : [NSString stringWithFormat:MULTIPLE_WEEKS, weeks];
@@ -468,7 +468,7 @@
[newFormat appendString:@"%Y"];
break;
default:
- [newFormat appendFormat:@"%%%iY", [span length]];
+ [newFormat appendFormat:@"%%%liY", [span length]];
}
} else if (it == 'M') {
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m
--- a/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIMutableOwnerArray.m Sat Oct 20 21:16:28 2012 +0200
@@ -57,7 +57,7 @@
- (NSString *)description
{
- NSMutableString *desc = [[NSMutableString alloc] initWithFormat:@"<%@: %x: ", NSStringFromClass([self class]), self];
+ NSMutableString *desc = [[NSMutableString alloc] initWithFormat:@"<%@: %p: ", NSStringFromClass([self class]), self];
NSUInteger i = 0;
for (id object in self) {
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/AIRichTextCoercer.m
--- a/Frameworks/AIUtilities Framework/Source/AIRichTextCoercer.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIRichTextCoercer.m Sat Oct 20 21:16:28 2012 +0200
@@ -55,7 +55,7 @@
}
}
- enum { RIGHTWARDS_ARROW = 0x2192 };
+ unsigned short RIGHTWARDS_ARROW = 0x2192;
NSLog(@"%s: Input '%@' %C Class %@ %C Result '%@'", __PRETTY_FUNCTION__, input, RIGHTWARDS_ARROW, class, RIGHTWARDS_ARROW, result);
return result;
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/AIStringAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sat Oct 20 21:16:28 2012 +0200
@@ -187,7 +187,7 @@
for (i = 0 ; i < length ; i++) {
/* Offset by the desired amount */
- [newString appendFormat:@"%C",([self characterAtIndex:i] + offset)];
+ [newString appendFormat:@"%c",([self characterAtIndex:i] + offset)];
}
return newString;
@@ -755,7 +755,7 @@
//^-----^ <-Returns this substring. (Trailing zeroes are deleted.)
//42.000000
//^^ <-Returns this substring (everything before the decimal point) for a whole number.
- NSString *format = numDigits ? [NSString stringWithFormat:@"%%.%uf", numDigits] : @"%f";
+ NSString *format = numDigits ? [NSString stringWithFormat:@"%%.%luf", numDigits] : @"%f";
NSString *str = [NSString stringWithFormat:format, (double)f];
NSUInteger i = [str length];
while (i-- > 0) {
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m
--- a/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m Sat Oct 20 21:16:28 2012 +0200
@@ -50,9 +50,9 @@
if(offset == 0)
str = [str stringByAppendingString:@"Z"];
if(offset < 0)
- str = [str stringByAppendingFormat:@"-%02d:%02d", -offset / 60, -offset % 60];
+ str = [str stringByAppendingFormat:@"-%02ld:%02ld", -offset / 60, -offset % 60];
else
- str = [str stringByAppendingFormat:@"+%02d:%02d", offset / 60, offset % 60];
+ str = [str stringByAppendingFormat:@"+%02ld:%02ld", offset / 60, offset % 60];
}
return str;
}
@@ -111,7 +111,7 @@
} else
timeString = @"";
- return [NSString stringWithFormat:@"%u-W%02u-%02u%@", year, week, dayOfWeek + 1U, timeString];
+ return [NSString stringWithFormat:@"%lu-W%02lu-%02lu%@", year, week, dayOfWeek + 1U, timeString];
}
- (NSString *)ISO8601OrdinalDateStringWithTime:(BOOL)includeTime timeSeparator:(unichar)timeSep {
NSString *timeString;
@@ -122,7 +122,7 @@
} else
timeString = @"";
- return [NSString stringWithFormat:@"%u-%03u%@", [self yearOfCommonEra], [self dayOfYear], timeString];
+ return [NSString stringWithFormat:@"%lu-%03lu%@", [self yearOfCommonEra], [self dayOfYear], timeString];
}
#pragma mark -
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Sat Oct 20 21:16:28 2012 +0200
@@ -212,7 +212,7 @@
[fileManager trashFileAtPath:[pluginDirectory stringByAppendingPathComponent:
[NSString stringWithFormat:@"%@-Adium.scpt",name]]];
} else {
- AILogWithSignature(@"Warning: Could not find %@",self, fullName);
+ AILogWithSignature(@"%@: Warning: Could not find %@", self, fullName);
}
}
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.m Sat Oct 20 21:16:28 2012 +0200
@@ -79,7 +79,7 @@
showJoinLeave = YES;
pendingOutgoingContentObjects = [[NSMutableArray alloc] init];
- AILog(@"[AIChat: %x initForAccount]",self);
+ AILog(@"[AIChat: %p initForAccount]",self);
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(contentObjectAdded:)
@@ -879,7 +879,7 @@
[account setTopic:inTopic forChat:self];
}
} else {
- AILogWithSignature(@"Attempt to set %@ topic when account doesn't support it.");
+ AILogWithSignature(@"Attempt to topic when account doesn't support it.");
}
}
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIEmoticon.m
--- a/Frameworks/Adium Framework/Source/AIEmoticon.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIEmoticon.m Sat Oct 20 21:16:28 2012 +0200
@@ -224,7 +224,7 @@
*/
- (NSString *)description
{
- return [NSString stringWithFormat:@"%@<%x> (Equivalents: %@) [in %@]",name,self,[self textEquivalents],pack];
+ return [NSString stringWithFormat:@"%@<%p> (Equivalents: %@) [in %@]",name,self,[self textEquivalents],pack];
}
/*!
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Sat Oct 20 21:16:28 2012 +0200
@@ -634,7 +634,7 @@
if (!UCIsSurrogateLowCharacter(lowSurrogate)) {
//In case you're wondering: 0xFFFF is not a low surrogate. (Nor anything else, for that matter.)
- AILog(@"AIHTMLDecoder: Got high surrogate of surrogate pair, but there's no low surrogate after it. This is at index %u of chunk with length %u. The chunk is: %@", i, length, chunk);
+ AILog(@"AIHTMLDecoder: Got high surrogate of surrogate pair, but there's no low surrogate after it. This is at index %lu of chunk with length %lu. The chunk is: %@", i, length, chunk);
} else {
UnicodeScalarValue codePoint = UCGetUnicodeScalarValueForSurrogatePair(/*highSurrogate*/ currentChar, lowSurrogate);
@@ -1411,14 +1411,14 @@
NSScanner *hexScanner = [NSScanner scannerWithString:hexString];
unsigned int character = 0;
if([hexScanner scanHexInt:&character])
- [attrString appendString:[NSString stringWithFormat:@"%C", character]
+ [attrString appendString:[NSString stringWithFormat:@"%C", (unsigned short)character]
withAttributes:[textAttributes dictionary]];
} else if ([chunkString hasPrefix:@"#"]) {
NSString *decString = [chunkString substringFromIndex:1];
NSScanner *decScanner = [NSScanner scannerWithString:decString];
int character = 0;
if([decScanner scanInt:&character])
- [attrString appendString:[NSString stringWithFormat:@"%C", character]
+ [attrString appendString:[NSString stringWithFormat:@"%C", (unsigned short)character]
withAttributes:[textAttributes dictionary]];
}
else { //Invalid
@@ -1964,14 +1964,14 @@
NSSize imageSize = [attachmentImage size];
[string appendFormat:@"<img %@src=\"%@%@\" alt=\"%@\" width=\"%i\" height=\"%i\">",
imageClassTag,
- srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", [[NSDate date] timeIntervalSince1970]] : @""),
+ srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", (unsigned int)[[NSDate date] timeIntervalSince1970]] : @""),
altName,
(int)imageSize.width, (int)imageSize.height];
} else {
[string appendFormat:@"<img %@src=\"%@%@\" alt=\"%@\">",
imageClassTag,
- srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", [[NSDate date] timeIntervalSince1970]] : @""),
+ srcPath, (uniqueifyHTML ? [NSString stringWithFormat:@"?%i", (unsigned int)[[NSDate date] timeIntervalSince1970]] : @""),
altName];
}
}
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIListBookmark.m
--- a/Frameworks/Adium Framework/Source/AIListBookmark.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m Sat Oct 20 21:16:28 2012 +0200
@@ -438,7 +438,7 @@
#pragma mark -
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@:%x %@ - %@ on %@ in %@>",NSStringFromClass([self class]), self, self.formattedUID, [self chatCreationDictionary], self.account, self.remoteGroups];
+ return [NSString stringWithFormat:@"<%@:%p %@ - %@ on %@ in %@>",NSStringFromClass([self class]), self, self.formattedUID, [self chatCreationDictionary], self.account, self.remoteGroups];
}
@end
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Sat Oct 20 21:16:28 2012 +0200
@@ -248,7 +248,7 @@
* Dropping between Away Contact and Offline Contact should make an Away Contact be > 120 but an Offline Contact be < 110.
* Only the sort controller knows the answer as to where this contact should be positioned in the end.
*/
- AILogWithSignature(@"%@: Moving %@ into %@'s index %i using order index %f (between %@ and %@)",
+ AILogWithSignature(@"%@: Moving %@ into %@'s index %li using order index %f (between %@ and %@)",
container, listObject, container.visibleContainedObjects, idx,
(nextHighest + nextLowest) / 2, nextObject, previousObject);
[container listObject: listObject didSetOrderIndex: (nextHighest + nextLowest) / 2];
@@ -808,7 +808,7 @@
#pragma mark Debugging
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@:%x %@>",NSStringFromClass([self class]), self, self.internalObjectID];
+ return [NSString stringWithFormat:@"<%@:%p %@>",NSStringFromClass([self class]), self, self.internalObjectID];
}
#pragma mark Applescript
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Sat Oct 20 21:16:28 2012 +0200
@@ -1124,7 +1124,7 @@
[self.enclosingScrollView setBackgroundColor:[NSColor controlBackgroundColor]];
}
- NSString *counterText = [NSString stringWithFormat:@"%d", currentCount];
+ NSString *counterText = [NSString stringWithFormat:@"%ld", currentCount];
if (characterCounterPrefix) {
counterText = [NSString stringWithFormat:@"%@%@", characterCounterPrefix, counterText];
@@ -1593,7 +1593,7 @@
NSUInteger currentLocation = 0;
NSRange attachmentRange;
- NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",NSAttachmentCharacter];
+ NSString *attachmentCharacterString = [NSString stringWithFormat:@"%C",(unsigned short)NSAttachmentCharacter];
//Find each attachment
attachmentRange = [[attributedString string] rangeOfString:attachmentCharacterString
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m Sat Oct 20 21:16:28 2012 +0200
@@ -1095,7 +1095,7 @@
NSString *subobjectDescsDesc = [subobjectDescs description];
[subobjectDescs release];
- return [NSString stringWithFormat:@"<%@:%x %@: %@>",NSStringFromClass([self class]), self, self.internalObjectID, subobjectDescsDesc];
+ return [NSString stringWithFormat:@"<%@:%p %@: %@>",NSStringFromClass([self class]), self, self.internalObjectID, subobjectDescsDesc];
}
- (BOOL) canContainObject:(id)obj
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AISoundSet.m
--- a/Frameworks/Adium Framework/Source/AISoundSet.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AISoundSet.m Sat Oct 20 21:16:28 2012 +0200
@@ -363,6 +363,6 @@
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@: %x - %@: %i sounds at %@>", NSStringFromClass([self class]), self, self.name, [self.sounds count], sourcePath];
+ return [NSString stringWithFormat:@"<%@: %p - %@: %li sounds at %@>", NSStringFromClass([self class]), self, self.name, [self.sounds count], sourcePath];
}
@end
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIStatusItem.m
--- a/Frameworks/Adium Framework/Source/AIStatusItem.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIStatusItem.m Sat Oct 20 21:16:28 2012 +0200
@@ -280,7 +280,7 @@
- (NSString *)description
{
- return [NSString stringWithFormat:@"<%@: %x [%@]>",
+ return [NSString stringWithFormat:@"<%@: %p [%@]>",
NSStringFromClass([self class]),
self,
[[self title] stringWithEllipsisByTruncatingToLength:20]];
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AITextAttachmentExtension.m
--- a/Frameworks/Adium Framework/Source/AITextAttachmentExtension.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AITextAttachmentExtension.m Sat Oct 20 21:16:28 2012 +0200
@@ -284,7 +284,7 @@
- (NSString *)description
{
- return [NSString stringWithFormat:@"%@<%x>: %@",NSStringFromClass([self class]),self,[super description]];
+ return [NSString stringWithFormat:@"%@<%p>: %@",NSStringFromClass([self class]),self,[super description]];
}
@end
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIWindowController.m
--- a/Frameworks/Adium Framework/Source/AIWindowController.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIWindowController.m Sat Oct 20 21:16:28 2012 +0200
@@ -147,7 +147,7 @@
if (!frameString) {
//Fall back on the old number-of-screens key
- frameString = [adium.preferenceController preferenceForKey:[NSString stringWithFormat:@"%@-%i",key,[[NSScreen screens] count]]
+ frameString = [adium.preferenceController preferenceForKey:[NSString stringWithFormat:@"%@-%li",key,[[NSScreen screens] count]]
group:PREF_GROUP_WINDOW_POSITIONS];
if (!frameString) {
//Fall back on the single screen preference if necessary (this is effectively a preference upgrade).
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m Sat Oct 20 21:16:28 2012 +0200
@@ -141,9 +141,9 @@
*/
- (void)setAttributeNames:(NSArray *)newAttrNames values:(NSArray *)newAttrVals
{
- NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %ui and %ui respectively", [newAttrNames count], [newAttrVals count]);
+ NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %lu and %lu respectively", [newAttrNames count], [newAttrVals count]);
NSUInteger numberOfDuplicates = [newAttrNames count] - [[NSSet setWithArray:newAttrNames] count];
- NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %ui duplicate(s)", numberOfDuplicates);
+ NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %lu duplicate(s)", numberOfDuplicates);
[attributeNames setArray:newAttrNames];
[attributeValues setArray:newAttrVals];
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Sat Oct 20 21:16:28 2012 +0200
@@ -399,7 +399,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = AH;
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0450;
ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
@@ -603,6 +603,7 @@
34C57363093E5E6E00829508 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -632,6 +633,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_DYNAMIC_NO_PIC = NO;
@@ -657,6 +659,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
@@ -681,6 +684,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -702,6 +706,7 @@
7EB550130DDC80DB000DC0D6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -723,6 +728,7 @@
7EB550150DDC80DB000DC0D6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -742,6 +748,7 @@
7EB550160DDC80DB000DC0D6 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INFOPLIST_FILE = "LinkDriver/LinkDriver-Info.plist";
@@ -834,6 +841,7 @@
DA8A8084085549EE00F24BB3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -856,6 +864,7 @@
DA8A8085085549EE00F24BB3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
diff -r bd88932e1080 -r 162d0f9e351f Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Sat Oct 20 21:16:28 2012 +0200
@@ -77,7 +77,7 @@
NSMutableCharacterSet *mutableStartSet = [[NSMutableCharacterSet alloc] init];
[mutableStartSet formUnionWithCharacterSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
- [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"\"'“”‘’.…,:;<?!-–—@%C%C", 0x2014, 0x2013]]];
+ [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"\"'“”‘’.…,:;<?!-–—@%C%C", (unsigned short)0x2014, (unsigned short)0x2013]]];
startSet = [[NSCharacterSet characterSetWithBitmapRepresentation:[mutableStartSet bitmapRepresentation]] retain];
[mutableStartSet release];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m
--- a/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Sat Oct 20 21:16:28 2012 +0200
@@ -491,7 +491,7 @@
NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:NULL];
if (attributes && [attributes objectForKey:NSFilePosixPermissions]) {
NSNumber *posixInfo = [attributes objectForKey:NSFilePosixPermissions];
- posixFlags = [NSString stringWithFormat:@"%X", [posixInfo longValue]];
+ posixFlags = [NSString stringWithFormat:@"%lX", [posixInfo longValue]];
}
return posixFlags;
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Sat Oct 20 21:16:28 2012 +0200
@@ -386,7 +386,7 @@
CC_SHA1_Update(&ctx, [JPEGData bytes], (CC_LONG)[JPEGData length]);
CC_SHA1_Final(digest, &ctx);
imagehash = [[NSData dataWithBytes:digest length:20] retain];
- AILogWithSignature(@"Will update with hash %@; length is %u", imagehash, [JPEGData length]);
+ AILogWithSignature(@"Will update with hash %@; length is %lu", imagehash, [JPEGData length]);
[self updatePHSH];
} else {
[[client client] reportError:@"Error adding image record" ofLevel:AWEzvWarning];
@@ -441,7 +441,7 @@
// Stop looking for new rendezvous clients
- (void)stopBrowsing
{
- AILogWithSignature(@"fServiceBrowser is %@ (retain count %i)", fServiceBrowser, [fServiceBrowser retainCount]);
+ AILogWithSignature(@"fServiceBrowser is %@ (retain count %li)", fServiceBrowser, [fServiceBrowser retainCount]);
[fServiceBrowser release]; fServiceBrowser = nil;
}
@@ -974,7 +974,7 @@
[self release];
} else {
- AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %d and data %s\n",
+ AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %ld and data %s\n",
DNSServiceRefSockFD(info), err, type, data);
}
}
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Sat Oct 20 21:16:28 2012 +0200
@@ -612,7 +612,7 @@
}
hexdata[[(NSData *)value length] * 2] = '\0';
- [infoData appendFormat:@"%c", ([(NSData *)value length] * 2 + [key length] + 1)];
+ [infoData appendFormat:@"%c", (int)([(NSData *)value length] * 2 + [key length] + 1)];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:[NSString stringWithUTF8String:hexdata]];
@@ -620,7 +620,7 @@
} else {
const char *val = [(NSString *)value UTF8String];
NSInteger len = strlen(val);
- [infoData appendFormat:@"%c", len + [key length] + 1];
+ [infoData appendFormat:@"%c", (int)(len + [key length] + 1)];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:value];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Sat Oct 20 21:16:28 2012 +0200
@@ -155,6 +155,6 @@
[string appendFormat:@"</%@>", name];
- return [NSString stringWithFormat:@"<AWEzvXMLNode %x:type %i:\"%@\">",self,type,string];
+ return [NSString stringWithFormat:@"<AWEzvXMLNode %p:type %i:\"%@\">",self,type,string];
}
@end
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Sat Oct 20 21:16:28 2012 +0200
@@ -1586,7 +1586,7 @@
NSMutableString *ms = [[NSMutableString alloc] init];
[ms appendString: [NSString stringWithFormat:@"<AsyncSocket %p", self]];
[ms appendString: [NSString stringWithFormat:@" local %@ remote %@ ", selfstr, peerstr]];
- [ms appendString: [NSString stringWithFormat:@"has queued %d reads %d writes, ", [theReadQueue count], [theWriteQueue count] ]];
+ [ms appendString: [NSString stringWithFormat:@"has queued %ld reads %ld writes, ", [theReadQueue count], [theWriteQueue count] ]];
if (theCurrentRead == nil)
[ms appendString: @"no current read, "];
@@ -1599,7 +1599,7 @@
else
percentDone = 100;
- [ms appendString: [NSString stringWithFormat:@"currently read %u bytes (%d%% done), ",
+ [ms appendString: [NSString stringWithFormat:@"currently read %lu bytes (%d%% done), ",
[theCurrentRead->buffer length],
theCurrentRead->bytesDone ? percentDone : 0]];
}
@@ -1615,7 +1615,7 @@
else
percentDone = 100;
- [ms appendString: [NSString stringWithFormat:@"currently written %u (%d%%), ",
+ [ms appendString: [NSString stringWithFormat:@"currently written %lu (%d%%), ",
[theCurrentWrite->buffer length],
theCurrentWrite->bytesDone ? percentDone : 0]];
}
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Sat Oct 20 21:16:28 2012 +0200
@@ -375,7 +375,7 @@
// Status Code 200 - OK
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
[self setHeaderFields:response forURI:[uri relativeString] appleSingle: isAppleSingle keepAlive:isKeepAlive];
- NSString *contentLength = [NSString stringWithFormat:@"%i", [data length]];
+ NSString *contentLength = [NSString stringWithFormat:@"%li", [data length]];
CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (CFStringRef)contentLength);
//NSDictionary *responseHeaders = [(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(response) autorelease];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sat Oct 20 21:16:28 2012 +0200
@@ -295,7 +295,7 @@
defaultButton:AILocalizedString(@"Close", nil)
alternateButton:AILocalizedStringFromTable(@"Cancel", @"Buttons", nil)
otherButton:nil
- informativeTextWithFormat:question];
+ informativeTextWithFormat:@"%@", question];
[alert setShowsSuppressionButton:YES];
[[alert suppressionButton] setTitle:suppressionText];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Error Message Handler/ErrorMessageWindowController.m
--- a/Plugins/Error Message Handler/ErrorMessageWindowController.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Error Message Handler/ErrorMessageWindowController.m Sat Oct 20 21:16:28 2012 +0200
@@ -163,7 +163,7 @@
[[self window] makeFirstResponder:button_okay];
} else {
[button_dismissAll setHidden:NO];
- [[self window] setTitle:[NSString stringWithFormat:@"%@ (x%i)",[errorWindowTitleArray objectAtIndex:0],[errorTitleArray count]]];
+ [[self window] setTitle:[NSString stringWithFormat:@"%@ (x%li)",[errorWindowTitleArray objectAtIndex:0],[errorTitleArray count]]];
[button_okay setTitle:AILocalizedString(@"Next",nil)];
[button_dismissAll setTitle:AILocalizedString(@"Dismiss All", @"Used in the error window; closes all open errors.")];
[[self window] makeFirstResponder:button_dismissAll];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/AMPurpleTuneTooltip.m
--- a/Plugins/Purple Service/AMPurpleTuneTooltip.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/AMPurpleTuneTooltip.m Sat Oct 20 21:16:28 2012 +0200
@@ -81,7 +81,7 @@
[text appendFormat:@" (%@)", [NSString stringWithUTF8String:albumstr]];
if (timeval > 0)
- [text appendFormat:@" - [%d:%02d]", timeval / 60, timeval % 60];
+ [text appendFormat:@" - [%ld:%02ld]", timeval / 60, timeval % 60];
return [AIHTMLDecoder decodeHTML:text];
}
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/CBPurpleAccount.m Sat Oct 20 21:16:28 2012 +0200
@@ -105,7 +105,7 @@
//Create a purple account if one does not already exist
if (!account) {
[self createNewPurpleAccount];
- AILog(@"Created PurpleAccount 0x%x with UID %@, protocolPlugin %s", account, self.UID, [self protocolPlugin]);
+ AILog(@"Created PurpleAccount %p with UID %@, protocolPlugin %s", account, self.UID, [self protocolPlugin]);
}
return account;
@@ -1597,7 +1597,7 @@
if (account->perm_deny != privacyType) {
account->perm_deny = privacyType;
serv_set_permit_deny(purple_account_get_connection(account));
- AILog(@"Set privacy options for %@ (%x %x) to %i",
+ AILog(@"Set privacy options for %@ (%p %p) to %i",
self,account,purple_account_get_connection(account),account->perm_deny);
[self setPreference:[NSNumber numberWithInteger:option]
@@ -1605,7 +1605,7 @@
group:GROUP_ACCOUNT_STATUS];
}
} else {
- AILog(@"Couldn't set privacy options for %@ (%x %x)",self,account,purple_account_get_connection(account));
+ AILog(@"Couldn't set privacy options for %@ (%p %p)",self,account,purple_account_get_connection(account));
}
}
@@ -2081,7 +2081,7 @@
//Apply any changes
[self notifyOfChangedPropertiesSilently:NO];
- AILog(@"************ %@ --step-- %i",self.UID,[step integerValue]);
+ AILog(@"************ %@ --step-- %li",self.UID,[step integerValue]);
}
/*!
@@ -2111,7 +2111,7 @@
//-[SLPurpleCocoaAdapter addAdiumAccount:] should have immediately called back on setPurpleAccount. It's bad if it didn't.
if (account) {
- AILog(@"Created PurpleAccount 0x%x with UID %@ and protocolPlugin %s", account, self.UID, [self protocolPlugin]);
+ AILog(@"Created PurpleAccount %p with UID %@ and protocolPlugin %s", account, self.UID, [self protocolPlugin]);
} else {
AILog(@"Unable to create Libpurple account with name %s and protocol plugin %s",
self.purpleAccountName, [self protocolPlugin]);
@@ -2642,7 +2642,7 @@
* to nil and we'll continue below to convert the image. */
buddyIconData = imageData;
- AILog(@"%@: Trying to use original GIF data, %i bytes", self, [buddyIconData length]);
+ AILog(@"%@: Trying to use original GIF data, %li bytes", self, [buddyIconData length]);
if (!buddyIconData) {
AILog(@"%@: Failed to use original GIF", self);
@@ -2664,9 +2664,9 @@
if ([buddyIconData length] > maxFileSize) {
buddyIconData = [image JPEGRepresentationWithMaximumByteSize:maxFileSize];
- AILog(@"%@: GIF too large, use a still JPEG of %i bytes", self, [buddyIconData length]);
+ AILog(@"%@: GIF too large, use a still JPEG of %li bytes", self, [buddyIconData length]);
} else {
- AILog(@"%@: Resized GIF, new file size %i!", self, [buddyIconData length]);
+ AILog(@"%@: Resized GIF, new file size %li!", self, [buddyIconData length]);
}
if (buddyIconData)
@@ -2711,7 +2711,7 @@
size_t maxFileSize = prpl_info->icon_spec.max_filesize;
if (maxFileSize > 0 && ([buddyIconData length] > maxFileSize)) {
- AILog(@"%@: Image %i is larger than %i!", self, [buddyIconData length], maxFileSize);
+ AILog(@"%@: Image %li is larger than %zi!", self, [buddyIconData length], maxFileSize);
for (i = 0; prpl_formats[i]; i++) {
if ((strcmp(prpl_formats[i],"jpeg") == 0) || (strcmp(prpl_formats[i],"jpg") == 0)) {
@@ -2726,7 +2726,7 @@
}
}
- AILogWithSignature(@"%@: Setting icon data of length %i", self, [buddyIconData length]);
+ AILogWithSignature(@"%@: Setting icon data of length %li", self, [buddyIconData length]);
[purpleAdapter setBuddyIcon:buddyIconData onAccount:self];
}
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/CBPurpleOscarAccount.m
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Sat Oct 20 21:16:28 2012 +0200
@@ -736,9 +736,9 @@
/* purple_imgstore_add_with_id() will take ownership of imgBytes and free it when done*/
NSInteger imgstore = purple_imgstore_add_with_id(imgBytes, imgBytesLength, [filename UTF8String]);
- AILog(@"Adding image id %i with name %s", imgstore, (filename ? [filename UTF8String] : "(null)"));
+ AILog(@"Adding image id %li with name %s", imgstore, (filename ? [filename UTF8String] : "(null)"));
- NSString *newTag = [NSString stringWithFormat:@"<IMG ID=\"%i\" CLASS=\"scaledToFitImage\">",imgstore];
+ NSString *newTag = [NSString stringWithFormat:@"<IMG ID=\"%li\" CLASS=\"scaledToFitImage\">",imgstore];
[processedString appendString:newTag];
if (!purpleImagesToUnref) purpleImagesToUnref = [[NSMutableSet alloc] init];
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/ESPurpleJabberAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Sat Oct 20 21:16:28 2012 +0200
@@ -236,8 +236,7 @@
defaultButton:AILocalizedString(@"OK",nil)
alternateButton:nil
otherButton:nil
- informativeTextWithFormat:[NSString stringWithFormat:
- AILocalizedString(@"Unable to parse the server list at %@. Please try again later.",nil), SERVERFEEDRSSURL]] runModal];
+ informativeTextWithFormat:AILocalizedString(@"Unable to parse the server list at %@. Please try again later.",nil), SERVERFEEDRSSURL] runModal];
} else {
MachineLocation loc;
ReadLocation(&loc);
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/ESPurpleMSNAccount.m
--- a/Plugins/Purple Service/ESPurpleMSNAccount.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.m Sat Oct 20 21:16:28 2012 +0200
@@ -352,7 +352,7 @@
while (friendlyNameUTF8String &&
strlen(purple_url_encode(friendlyNameUTF8String)) > BUDDY_ALIAS_MAXLEN) {
- AILog(@"Shortening because %s (max len %i) [%s] len (%i) > %i",
+ AILog(@"Shortening because %s (max len %li) [%s] len (%zi) > %i",
friendlyNameUTF8String, currentMaxNumberOfPreEncodedCharacters,
purple_url_encode(friendlyNameUTF8String),strlen(purple_url_encode(friendlyNameUTF8String)),
BUDDY_ALIAS_MAXLEN);
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sat Oct 20 21:16:28 2012 +0200
@@ -488,7 +488,7 @@
if (!chat) {
NSString *errorString;
- errorString = [NSString stringWithFormat:@"conv %x: Got nil chat in lookup for sourceContact %@ (%x ; \"%s\" ; \"%s\") on adiumAccount %@ (%x ; \"%s\")",
+ errorString = [NSString stringWithFormat:@"conv %p: Got nil chat in lookup for sourceContact %@ (%p ; \"%s\" ; \"%s\") on adiumAccount %@ (%p ; \"%s\")",
conv,
sourceContact,
buddy,
@@ -757,7 +757,7 @@
} else {
//If we didn't get a purpleImage, just leave the tag for now.. maybe it was important?
- [newString appendFormat:@"<IMG ID=\"%ld\">",chunkString];
+ [newString appendFormat:@"<IMG ID=\"%p\">",chunkString];
}
}
}
@@ -909,7 +909,7 @@
- (void)disconnectAccount:(id)adiumAccount
{
PurpleAccount *account = accountLookupFromAdiumAccount(adiumAccount);
- AILog(@"Setting %x disabled and offline (%s)...",account,
+ AILog(@"Setting %p disabled and offline (%s)...",account,
purple_status_type_get_id(purple_account_get_status_type_with_primitive(account, PURPLE_STATUS_OFFLINE)));
purple_account_set_enabled(account, "Adium", NO);
@@ -1400,7 +1400,7 @@
PurpleAccount *account = accountLookupFromAdiumAccount(adiumAccount);
GList *attrs = createListFromDictionary(arguments);
- AILog(@"Setting status on %x (%s): ID %s, isActive %i, attributes %@",account, purple_account_get_username(account),
+ AILog(@"Setting status on %p (%s): ID %s, isActive %i, attributes %@",account, purple_account_get_username(account),
statusID, [isActive boolValue], arguments);
purple_account_set_status_list(account, statusID, [isActive boolValue], attrs);
diff -r bd88932e1080 -r 162d0f9e351f Plugins/Purple Service/adiumPurpleConnection.m
--- a/Plugins/Purple Service/adiumPurpleConnection.m Sat Oct 20 14:15:20 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleConnection.m Sat Oct 20 21:16:28 2012 +0200
@@ -22,7 +22,7 @@
if (!PURPLE_CONNECTION_IS_VALID(gc)) return;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AILog(@"Connecting: gc=0x%x (%s) %i / %i", gc, text, step, step_count);
+ AILog(@"Connecting: gc=%p (%s) %zi / %zi", gc, text, step, step_count);
NSNumber *connectionProgressPrecent = [NSNumber numberWithDouble:((CGFloat)step / (CGFloat)(step_count-1))];
[accountLookup(purple_connection_get_account(gc)) mainPerformSelector:@selector(accountConnectionProgressStep:percentDone:)
@@ -34,7 +34,7 @@
static void adiumPurpleConnConnected(PurpleConnection *gc)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AILog(@"Connected: gc=%x", gc);
+ AILog(@"Connected: gc=%p", gc);
[accountLookup(purple_connection_get_account(gc)) accountConnectionConnected];
[pool drain];
@@ -43,7 +43,7 @@
More information about the commits
mailing list