adium-1.4 3210:e64643e157b3: Missed part of fixing the project m...

commits at adium.im commits at adium.im
Mon Nov 1 22:40:18 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/e64643e157b3
revision:	3210:e64643e157b3
author:		Evan Schoenberg
date:		Mon Nov 01 17:39:35 2010 -0500

Missed part of fixing the project merge
Subject: adium-1.4 3211:dc87ab524a41: Fixed a warning introduced in 8b2a6ff84514. Refs #12339

details:	http://hg.adium.im/adium-1.4/rev/dc87ab524a41
revision:	3211:dc87ab524a41
author:		Evan Schoenberg
date:		Mon Nov 01 17:40:12 2010 -0500

Fixed a warning introduced in 8b2a6ff84514. Refs #12339

diffs (48 lines):

diff -r 8b2a6ff84514 -r dc87ab524a41 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Apr 20 20:58:32 2010 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Mon Nov 01 17:40:12 2010 -0500
@@ -596,6 +596,7 @@
 		348F57940936F3CC00288E41 /* ESEditStatusGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F57920936F3CC00288E41 /* ESEditStatusGroupWindowController.m */; };
 		348F579E0936FA6D00288E41 /* EditStatusGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.nib */; };
 		3490615D127F70B100FC313F /* TemporaryIRCAccountWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3490615C127F70B100FC313F /* TemporaryIRCAccountWindow.nib */; };
+		34906190127F78F200FC313F /* AITemporaryIRCAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34906172127F742200FC313F /* AITemporaryIRCAccountWindowController.m */; };
 		349195660C9662AA00595A04 /* AIListBookmark.m in Sources */ = {isa = PBXBuildFile; fileRef = 349195640C9662AA00595A04 /* AIListBookmark.m */; };
 		349195670C9662AA00595A04 /* AIListBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 349195650C9662AA00595A04 /* AIListBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3496A8C207CE6B880055BBAB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3496A8C107CE6B880055BBAB /* InfoPlist.strings */; };
@@ -3219,6 +3220,8 @@
 		348FF83E09128BEB00A942A8 /* CBPurpleAccount.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBPurpleAccount.m; path = "Plugins/Purple Service/CBPurpleAccount.m"; sourceTree = "<group>"; };
 		348FF84909128D6300A942A8 /* AccountDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = AccountDefaults.plist; path = "Frameworks/Adium Framework/AccountDefaults.plist"; sourceTree = "<group>"; };
 		3490615C127F70B100FC313F /* TemporaryIRCAccountWindow.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = TemporaryIRCAccountWindow.nib; path = Resources/TemporaryIRCAccountWindow.nib; sourceTree = "<group>"; };
+		34906171127F742200FC313F /* AITemporaryIRCAccountWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITemporaryIRCAccountWindowController.h; path = Source/AITemporaryIRCAccountWindowController.h; sourceTree = "<group>"; };
+		34906172127F742200FC313F /* AITemporaryIRCAccountWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITemporaryIRCAccountWindowController.m; path = Source/AITemporaryIRCAccountWindowController.m; sourceTree = "<group>"; };
 		349195640C9662AA00595A04 /* AIListBookmark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIListBookmark.m; path = "Frameworks/Adium Framework/Source/AIListBookmark.m"; sourceTree = "<group>"; };
 		349195650C9662AA00595A04 /* AIListBookmark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIListBookmark.h; path = "Frameworks/Adium Framework/Source/AIListBookmark.h"; sourceTree = "<group>"; };
 		34943DEE07BAD918000F2A03 /* AccountPrivacy.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = AccountPrivacy.nib; path = "Frameworks/Adium Framework/Resources/AccountPrivacy.nib"; sourceTree = "<group>"; };
@@ -6588,6 +6591,8 @@
 				34F1023A073449D500890D3B /* XtrasInstaller.h */,
 				34F10239073449D500890D3B /* XtrasInstaller.m */,
 				34F1022A0734499600890D3B /* XtraProgressWindow.nib */,
+				34906171127F742200FC313F /* AITemporaryIRCAccountWindowController.h */,
+				34906172127F742200FC313F /* AITemporaryIRCAccountWindowController.m */,
 			);
 			name = "URL and Xtras Installation handling";
 			sourceTree = "<group>";
@@ -10667,6 +10672,7 @@
 				112939100FD5AE1400FA8F53 /* AIConfirmationsAdvancedPreferences.m in Sources */,
 				11D915720FFC100700B39713 /* AIGenericMultipartImageUploader.m in Sources */,
 				11000D041098863B0096A1E2 /* AIDefaultFontRemovalPlugin.m in Sources */,
+				34906190127F78F200FC313F /* AITemporaryIRCAccountWindowController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -r 8b2a6ff84514 -r dc87ab524a41 Source/AITemporaryIRCAccountWindowController.m
--- a/Source/AITemporaryIRCAccountWindowController.m	Tue Apr 20 20:58:32 2010 +0200
+++ b/Source/AITemporaryIRCAccountWindowController.m	Mon Nov 01 17:40:12 2010 -0500
@@ -14,6 +14,7 @@
 #import "AIServiceMenu.h"
 #import <AIUtilities/AIStringAdditions.h>
 #import <AIUtilities/AIStringFormatter.h>
+#import <Adium/AIChatControllerProtocol.h>
 
 @implementation AITemporaryIRCAccountWindowController
 




More information about the commits mailing list