adium 5095:daca90b559a1: Fix a few warnings.
commits at adium.im
commits at adium.im
Wed Sep 26 03:05:44 UTC 2012
details: http://hg.adium.im/adium/rev/daca90b559a1
revision: 5095:daca90b559a1
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Tue Sep 25 23:05:15 2012 -0400
Fix a few warnings.
diffs (101 lines):
diff -r a1cb841562f6 -r daca90b559a1 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Sep 23 22:25:54 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Tue Sep 25 23:05:15 2012 -0400
@@ -1482,6 +1482,7 @@
C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */; };
C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */; };
C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */; };
+ C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */; };
C6EE433E15C0A9BC00A4B96C /* default-icon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */; };
C6EE434015C0AA4600A4B96C /* emoticonBlank at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */; };
C6EE434215C0AA6F00A4B96C /* sidebarActionWidget at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */; };
@@ -1489,7 +1490,6 @@
C6EE434615C0AA9100A4B96C /* SoundLow at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434515C0AA9100A4B96C /* SoundLow at 2x.png */; };
C6EE434C15C0AB7400A4B96C /* Flap_192 at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434B15C0AB7400A4B96C /* Flap_192 at 2x.png */; };
C6EE434E15C0AB7F00A4B96C /* Awake_192 at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434D15C0AB7F00A4B96C /* Awake_192 at 2x.png */; };
- C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */; };
D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */ = {isa = PBXBuildFile; fileRef = D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */; };
EE147A6D0896B18800A21377 /* ABSearch.png in Resources */ = {isa = PBXBuildFile; fileRef = EE147A6C0896B18700A21377 /* ABSearch.png */; };
EE147A790896B32400A21377 /* ABSearch.xib in Resources */ = {isa = PBXBuildFile; fileRef = EE147A780896B32400A21377 /* ABSearch.xib */; };
@@ -4543,6 +4543,7 @@
C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover at 2x.png"; path = "Resources/FTProgressStopRollover at 2x.png"; sourceTree = "<group>"; };
C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundFileIcon at 2x.png"; path = "Resources/SoundFileIcon at 2x.png"; sourceTree = "<group>"; };
C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ABSearch at 2x.png"; path = "Resources/ABSearch at 2x.png"; sourceTree = "<group>"; };
+ C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-notification.tiff"; path = "Resources/events-notification.tiff"; sourceTree = "<group>"; };
C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "default-icon at 2x.png"; path = "Resources/default-icon at 2x.png"; sourceTree = "<group>"; };
C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoticonBlank at 2x.png"; path = "Resources/emoticonBlank at 2x.png"; sourceTree = "<group>"; };
C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebarActionWidget at 2x.png"; path = "Resources/sidebarActionWidget at 2x.png"; sourceTree = "<group>"; };
@@ -4550,7 +4551,6 @@
C6EE434515C0AA9100A4B96C /* SoundLow at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundLow at 2x.png"; path = "Resources/SoundLow at 2x.png"; sourceTree = "<group>"; };
C6EE434B15C0AB7400A4B96C /* Flap_192 at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Flap_192 at 2x.png"; path = "Resources/Flap_192 at 2x.png"; sourceTree = "<group>"; };
C6EE434D15C0AB7F00A4B96C /* Awake_192 at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Awake_192 at 2x.png"; path = "Resources/Awake_192 at 2x.png"; sourceTree = "<group>"; };
- C6BC7F9A15DD666600C5FF52 /* events-notification.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-notification.tiff"; path = "Resources/events-notification.tiff"; sourceTree = "<group>"; };
D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-source-destination.tiff"; path = "Resources/msg-source-destination.tiff"; sourceTree = "<group>"; };
D182F1B411DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D182F1B611DFF23700E33AE2 /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = sk_SK.lproj/schema.strings; sourceTree = "<group>"; };
diff -r a1cb841562f6 -r daca90b559a1 Frameworks/AIUtilities Framework/Source/AITextViewAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AITextViewAdditions.m Sun Sep 23 22:25:54 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AITextViewAdditions.m Tue Sep 25 23:05:15 2012 -0400
@@ -19,7 +19,8 @@
#import "AITextAttributes.h"
@implementation NSTextView (AITextViewAdditions)
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
- (void)changeDocumentBackgroundColor:(id)sender
{
NSColor *newColor = [sender color];
@@ -40,4 +41,5 @@
[self didChangeText];
}
+#pragma clang diagnostic pop
@end
diff -r a1cb841562f6 -r daca90b559a1 Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m Sun Sep 23 22:25:54 2012 +0200
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m Tue Sep 25 23:05:15 2012 -0400
@@ -22,8 +22,10 @@
#include <dispatch/dispatch.h>
-// This one is missing from the headers...
+// This one is missing from the 10.6 headers...
+#ifndef NSEC_PER_MSEC
#define NSEC_PER_MSEC (NSEC_PER_SEC / 1000)
+#endif
//#define PURPLE_SOCKET_DEBUG
diff -r a1cb841562f6 -r daca90b559a1 Source/AIObjectDebug.m
--- a/Source/AIObjectDebug.m Sun Sep 23 22:25:54 2012 +0200
+++ b/Source/AIObjectDebug.m Tue Sep 25 23:05:15 2012 -0400
@@ -39,7 +39,8 @@
asm(".desc ___crashreporter_info__, 0x10");
@implementation NSObject (AIObjectDebug)
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
- (void)doesNotRecognizeSelector:(SEL)aSelector
{
if (sel_isEqual(aSelector, @selector(description)) || sel_isEqual(aSelector, @selector(doesNotRecognizeSelector:))) {
@@ -53,6 +54,6 @@
__crashreporter_info__ = (char *)[[NSString stringWithFormat:@"Dear crash reporter team: We only put stuff here in debug builds of Adium. Don't Panic, it won't ship in a release unless there's public API for it.\n\n %@ of class %@ does not respond to selector %s", self, [self class], aSelector] cStringUsingEncoding:NSASCIIStringEncoding];
abort();
}
-
+#pragma clang diagnostic pop
@end
#endif
diff -r a1cb841562f6 -r daca90b559a1 Source/ESiTunesPlugin.m
--- a/Source/ESiTunesPlugin.m Sun Sep 23 22:25:54 2012 +0200
+++ b/Source/ESiTunesPlugin.m Tue Sep 25 23:05:15 2012 -0400
@@ -32,6 +32,7 @@
#import <Adium/AIHTMLDecoder.h>
#import <Adium/AIStatus.h>
#import <WebKit/WebKit.h>
+#import <AIUtilities/AIApplicationAdditions.h>
#define STRING_TRIGGERS_MENU AILocalizedString(@"Insert iTunes Token", "Label used for edit and contextual menus of iTunes triggers")
#define STRING_TRIGGERS_TOOLBAR AILocalizedString(@"iTunes","Label for iTunes toolbar menu item.")
More information about the commits
mailing list