[Adium-commits] adium 1952:7f59e1b65aca: Ignore the compiled python script for t...
adium-commits at adiumx.com
adium-commits at adiumx.com
Thu Apr 23 16:46:01 UTC 2009
details: http://hg.adiumx.com/adium/rev/7f59e1b65aca
revision: 1952:7f59e1b65aca
author: Zachary West <zacw at adiumx.com>
date: Thu Apr 23 12:45:03 2009 -0400
Ignore the compiled python script for the framework maker.
Subject: adium 1953:c469f1d56247: im.pidgin.adium at 558bbc9f9ef445ae3641bd8caf426c142be3df85.
details: http://hg.adiumx.com/adium/rev/c469f1d56247
revision: 1953:c469f1d56247
author: Zachary West <zacw at adiumx.com>
date: Thu Apr 23 12:45:14 2009 -0400
im.pidgin.adium at 558bbc9f9ef445ae3641bd8caf426c142be3df85.
Subject: adium 1954:0ed90a175f06: Automated merge with ssh://hg@hg.adiumx.com/adium
details: http://hg.adiumx.com/adium/rev/0ed90a175f06
revision: 1954:0ed90a175f06
author: Zachary West <zacw at adiumx.com>
date: Thu Apr 23 12:45:33 2009 -0400
Automated merge with ssh://hg@hg.adiumx.com/adium
diffstat:
.hgignore | 1 +
Adium.pch | 2 +
Adium.xcodeproj/project.pbxproj | 28 +---
Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h | 2 -
Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h | 2 -
Frameworks/AIUtilities Framework/Source/AIDividedAlternatingRowOutlineView.h | 1 -
Frameworks/AIUtilities Framework/Source/AIDockingWindow.h | 2 -
Frameworks/AIUtilities Framework/Source/AIEventAdditions.h | 2 -
Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h | 2 -
Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.h | 2 -
Frameworks/AIUtilities Framework/Source/AIPasteboardAdditions.h | 2 -
Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.h | 3 -
Frameworks/AIUtilities Framework/Source/AITextViewAdditions.h | 3 -
Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.h | 5 +-
Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAAtomicList.h | 3 -
Frameworks/AIUtilities Framework/Source/RAOperationQueue/RALatchTrigger.h | 2 -
Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperation.h | 3 -
Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperationQueue.h | 3 -
Frameworks/Adium Framework/Source/AIAbstractAccount.m | 1 -
Frameworks/Adium Framework/Source/AIAbstractListController.m | 1 -
Frameworks/Adium Framework/Source/AIAccount.m | 1 -
Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m | 1 -
Frameworks/Adium Framework/Source/AIAccountViewController.m | 1 -
Frameworks/Adium Framework/Source/AIAddressBookController.m | 1 -
Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m | 1 -
Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m | 1 -
Frameworks/Adium Framework/Source/AIChat.m | 1 -
Frameworks/Adium Framework/Source/AIContactHidingController.m | 1 -
Frameworks/Adium Framework/Source/AICorePluginLoader.m | 1 -
Frameworks/Adium Framework/Source/AIEditStateWindowController.m | 1 -
Frameworks/Adium Framework/Source/AIGroupChatStatusIcons.m | 1 -
Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h | 1 -
Frameworks/Adium Framework/Source/AIListContact.m | 1 -
Frameworks/Adium Framework/Source/AIListGroup.m | 1 -
Frameworks/Adium Framework/Source/AIListObject.m | 1 -
Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.h | 1 -
Frameworks/Adium Framework/Source/AIListOutlineView.m | 1 -
Frameworks/Adium Framework/Source/AIMessageEntryTextView.h | 1 -
Frameworks/Adium Framework/Source/AIMessageEntryTextView.m | 1 -
Frameworks/Adium Framework/Source/AIPlugin.m | 1 -
Frameworks/Adium Framework/Source/AIPreferencePane.h | 1 -
Frameworks/Adium Framework/Source/AIProxyListObject.h | 2 -
Frameworks/Adium Framework/Source/AIServiceIcons.m | 1 -
Frameworks/Adium Framework/Source/AISortController.m | 1 -
Frameworks/Adium Framework/Source/AIStatusItem.m | 1 -
Frameworks/Adium Framework/Source/AIStatusMenu.m | 1 -
Frameworks/Adium Framework/Source/AIUserIcons.m | 1 -
Frameworks/Adium Framework/Source/AIWindowController.h | 2 -
Frameworks/Adium Framework/Source/AIWindowController.m | 1 -
Frameworks/Adium Framework/Source/ESApplescriptabilityController.m | 1 -
Frameworks/Adium Framework/Source/ESContactAlertsViewController.m | 1 -
Frameworks/Adium Framework/Source/ESDebugAILog.m | 1 -
Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h | 2 -
Frameworks/ShortcutRecorder/Source/SRCommon.h | 2 -
Frameworks/ShortcutRecorder/Source/SRKeyCodeTransformer.h | 2 -
Frameworks/ShortcutRecorder/Source/SRRecorderCell.h | 1 -
Frameworks/ShortcutRecorder/Source/SRRecorderControl.h | 1 -
Frameworks/ShortcutRecorder/Source/SRValidator.h | 2 -
Frameworks/libpurple.framework/Versions/0.6.0/Headers/marshallers.h | 10 +-
Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h | 14 +
Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h | 76 ++++----
Frameworks/libpurple.framework/Versions/0.6.0/libpurple |
Plugins/Bonjour/AWBonjourPlugin.h | 1 -
Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h | 1 -
Plugins/Bonjour/libezv/Other Sources/libezv_Prefix.h | 36 ----
Plugins/Bonjour/libezv/Simple HTTP Server/HTTPAuthenticationRequest.h | 2 -
Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h | 1 -
Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.h | 1 -
Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m | 1 -
Plugins/Dock Icon Badging/AIDockBadger.h | 1 -
Plugins/Dock Icon Badging/AIDockBadger.m | 1 -
Plugins/Dual Window Interface/AIAccountSelectionView.h | 1 -
Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.h | 1 -
Plugins/Dual Window Interface/AIDualWindowInterfacePlugin.m | 1 -
Plugins/Dual Window Interface/AIJumpControlPlugin.h | 1 -
Plugins/Dual Window Interface/AIJumpControlPlugin.m | 1 -
Plugins/Dual Window Interface/AIMessageTabViewItem.h | 1 -
Plugins/Dual Window Interface/AIMessageTabViewItem.m | 1 -
Plugins/Dual Window Interface/AIMessageViewController.m | 1 -
Plugins/Dual Window Interface/AIMessageWindowController.m | 1 -
Plugins/Dual Window Interface/ESDualWindowMessageAdvancedPreferences.m | 1 -
Plugins/Emoticons/AIEmoticonPreferences.m | 1 -
Plugins/Error Message Handler/ErrorMessageHandlerPlugin.h | 1 -
Plugins/General Preferences/ESGeneralPreferencesPlugin.h | 1 -
Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.h | 1 -
Plugins/Link Management/SHLinkManagementPlugin.h | 1 -
Plugins/Message Alias Support/AIMessageAliasPlugin.h | 1 -
Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.h | 1 -
Plugins/Open Message Window Contact Alert/ESOpenMessageWindowContactAlertPlugin.h | 1 -
Plugins/Purple Service/AIIRCServicesPasswordPlugin.h | 1 -
Plugins/Purple Service/AILibpurplePlugin.h | 1 -
Plugins/Purple Service/AIPurpleAIMAccountViewController.m | 1 -
Plugins/Purple Service/AIPurpleOscarAccountViewController.m | 1 -
Plugins/Purple Service/CBPurpleAccount.m | 1 -
Plugins/Purple Service/CBPurpleServicePlugin.h | 1 -
Plugins/Purple Service/CBPurpleServicePlugin.m | 1 -
Plugins/Purple Service/ESPurpleAIMAccount.m | 1 -
Plugins/Purple Service/ESPurpleMSNAccount.m | 1 -
Plugins/Purple Service/PurpleFacebookAccount.h | 1 -
Plugins/Purple Service/PurpleFacebookAccountViewController.h | 1 -
Plugins/Purple Service/PurpleFacebookService.h | 1 -
Plugins/Purple Service/adiumPurpleRequest.m | 1 -
Plugins/Secure Messaging/ESSecureMessagingPlugin.h | 1 -
Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.h | 1 -
Plugins/Status Menu Item/AIStatusItemView.h | 1 -
Plugins/Status Menu Item/CBStatusMenuItemController.m | 1 -
Plugins/Status Menu Item/CBStatusMenuItemPlugin.h | 1 -
Plugins/Status Menu Item/CBStatusMenuItemPlugin.m | 1 -
Plugins/Twitter Plugin/AILaconicaPlugin.h | 1 -
Plugins/Twitter Plugin/AITwitterAccount.m | 1 -
Plugins/Twitter Plugin/AITwitterPlugin.h | 1 -
Plugins/Twitter Plugin/AITwitterURLHandler.h | 1 -
Plugins/Video Chat Interface/AIVideoChatInterfacePlugin.h | 1 -
Plugins/WebKit Message View/AIWebKitMessageViewPlugin.h | 1 -
Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m | 1 -
Plugins/WebKit Message View/AIWebKitPreviewMessageViewController.m | 1 -
Source/AIAccountController.m | 1 -
Source/AIAccountListPreferencesPlugin.h | 1 -
Source/AIAccountMenuAccessPlugin.h | 1 -
Source/AIAddBookmarkPlugin.h | 1 -
Source/AIAdium.h | 1 -
Source/AIAdium.m | 1 -
Source/AIAdvancedPreferences.m | 1 -
Source/AIAdvancedPreferencesPlugin.h | 1 -
Source/AIAliasSupportPlugin.h | 1 -
Source/AIAliasSupportPlugin.m | 1 -
Source/AIAlphabeticalSort.m | 1 -
Source/AIAppearancePreferencesPlugin.h | 1 -
Source/AIApplication.m | 1 -
Source/AIAutoLinkingPlugin.h | 1 -
Source/AIAutoReplyPlugin.h | 1 -
Source/AIAutoReplyPlugin.m | 1 -
Source/AIAutomaticStatus.h | 1 -
Source/AIAutomaticStatus.m | 1 -
Source/AIBorderlessListWindowController.m | 1 -
Source/AIChatConsolidationPlugin.h | 1 -
Source/AIChatController.m | 1 -
Source/AIChatCyclingPlugin.h | 1 -
Source/AIChatCyclingPlugin.m | 1 -
Source/AIContactAwayPlugin.h | 1 -
Source/AIContactController.m | 1 -
Source/AIContactIdlePlugin.h | 1 -
Source/AIContactIdlePlugin.m | 10 +-
Source/AIContactInfoWindowController.m | 1 -
Source/AIContactInfoWindowPlugin.h | 1 -
Source/AIContactListEditorPlugin.h | 1 -
Source/AIContactListRecentImagesWindowController.m | 1 -
Source/AIContactOnlineSincePlugin.h | 1 -
Source/AIContactSortSelectionPlugin.h | 1 -
Source/AIContactSortSelectionPlugin.m | 1 -
Source/AIContactStatusColoringPlugin.h | 1 -
Source/AIContactStatusColoringPlugin.m | 1 -
Source/AIContactStatusEventsPlugin.h | 1 -
Source/AIContactVisibilityControlPlugin.h | 1 -
Source/AIContactVisibilityControlPlugin.m | 1 -
Source/AIContentController.m | 1 -
Source/AICoreComponentLoader.h | 1 -
Source/AICoreComponentLoader.m | 1 -
Source/AIDockAccountStatusPlugin.h | 1 -
Source/AIDockAccountStatusPlugin.m | 1 -
Source/AIDockBehaviorPlugin.h | 1 -
Source/AIDockController.m | 1 -
Source/AIDockIconSelectionSheet.m | 1 -
Source/AIDockUnviewedContentPlugin.h | 1 -
Source/AIDockUnviewedContentPlugin.m | 1 -
Source/AIEditAccountWindowController.m | 1 -
Source/AIEmoticonController.m | 1 -
Source/AIEventSoundsPlugin.h | 1 -
Source/AIExtendedStatusPlugin.h | 1 -
Source/AIExtendedStatusPlugin.m | 1 -
Source/AIGroupChatStatusTooltipPlugin.h | 1 -
Source/AIIRCChannelLinker.h | 1 -
Source/AIInterfaceController.m | 1 -
Source/AIListController.m | 1 -
Source/AIListLayoutWindowController.m | 1 -
Source/AIListThemeWindowController.m | 1 -
Source/AIListWindowController.m | 1 -
Source/AILogViewerWindowController.m | 1 -
Source/AILoggerPlugin.h | 1 -
Source/AILoggerPlugin.m | 1 -
Source/AIMentionAdvancedPreferences.m | 1 -
Source/AIMentionEventPlugin.h | 1 -
Source/AIMentionEventPlugin.m | 1 -
Source/AIMenuController.h | 1 -
Source/AIMessageHistoryPreferencesWindowController.m | 1 -
Source/AINewMessagePanelPlugin.h | 1 -
Source/AINulRemovalPlugin.h | 1 -
Source/AIPreferenceContainer.h | 2 +-
Source/AIPreferenceContainer.m | 18 +-
Source/AIPreferenceController.h | 1 -
Source/AIPreferenceWindowController.m | 1 -
Source/AIRealNameTooltip.h | 1 -
Source/AISCLViewPlugin.h | 1 -
Source/AISCLViewPlugin.m | 1 -
Source/AIStandardListWindowController.m | 1 -
Source/AIStandardToolbarItemsPlugin.h | 1 -
Source/AIStateMenuPlugin.h | 1 -
Source/AIStatusChangedMessagesPlugin.h | 1 -
Source/AIStatusController.m | 1 -
Source/AITabStatusIconsPlugin.h | 1 -
Source/AITwitterIMPlugin.h | 1 -
Source/AIURLHandlerAdvancedPreferences.m | 1 -
Source/AIURLHandlerPlugin.h | 1 -
Source/AIURLHandlerPlugin.m | 1 -
Source/AIURLShortenerPlugin.h | 1 -
Source/AIURLShortenerPlugin.m | 1 -
Source/AIUserHostTooltip.h | 1 -
Source/AIXMLChatlogConverter.m | 1 -
Source/AIXtrasManager.h | 1 -
Source/AdiumAccounts.m | 1 -
Source/AdiumFormatting.m | 1 -
Source/AdiumOTREncryption.m | 1 -
Source/AdiumSound.m | 1 -
Source/AdiumSpeech.m | 1 -
Source/BGContactNotesPlugin.h | 1 -
Source/BGEmoticonMenuPlugin.h | 1 -
Source/BGEmoticonMenuPlugin.m | 1 -
Source/CBActionSupportPlugin.h | 1 -
Source/CBContactCountingDisplayPlugin.h | 1 -
Source/CBContactCountingDisplayPlugin.m | 1 -
Source/CBContactLastSeenPlugin.h | 1 -
Source/CBContactLastSeenPlugin.m | 1 -
Source/DCJoinChatPanelPlugin.h | 1 -
Source/DCMessageContextDisplayPlugin.h | 1 -
Source/DCMessageContextDisplayPlugin.m | 1 -
Source/ESAccountEvents.h | 1 -
Source/ESAccountNetworkConnectivityPlugin.h | 1 -
Source/ESAddressBookIntegrationAdvancedPreferences.m | 1 -
Source/ESAnnouncerAbstractDetailPane.m | 1 -
Source/ESAnnouncerPlugin.h | 1 -
Source/ESAnnouncerPlugin.m | 1 -
Source/ESApplescriptContactAlertPlugin.h | 1 -
Source/ESAwayStatusWindowController.m | 1 -
Source/ESAwayStatusWindowPlugin.h | 1 -
Source/ESAwayStatusWindowPlugin.m | 1 -
Source/ESBlockingPlugin.h | 1 -
Source/ESContactAlertsController.m | 1 -
Source/ESContactClientPlugin.h | 1 -
Source/ESContactListAdvancedPreferences.m | 1 -
Source/ESContactServersideDisplayName.h | 1 -
Source/ESDebugController.m | 1 -
Source/ESDebugWindowController.m | 1 -
Source/ESEventSoundAlertDetailPane.m | 1 -
Source/ESFileTransferMessagesPlugin.h | 1 -
Source/ESFileTransferRequestPromptController.m | 1 -
Source/ESGlobalEventsPreferencesPlugin.h | 1 -
Source/ESMetaContactContentsPlugin.h | 1 -
Source/ESPersonalPreferences.m | 1 -
Source/ESPersonalPreferencesPlugin.h | 1 -
Source/ESPersonalPreferencesPlugin.m | 1 -
Source/ESSafariLinkToolbarItemPlugin.h | 1 -
Source/ESStatusAdvancedPreferences.m | 1 -
Source/ESStatusPreferencesPlugin.h | 1 -
Source/ESStatusSort.m | 1 -
Source/ESUserIconHandlingPlugin.h | 1 -
Source/ESUserIconHandlingPlugin.m | 1 -
Source/ESiTunesPlugin.h | 1 -
Source/GBApplescriptFiltersPlugin.h | 1 -
Source/GBFireImporter.m | 1 -
Source/GBImportPlugin.h | 1 -
Source/GBQuestionHandlerPlugin.h | 1 -
Source/NEHGrowlPlugin.h | 1 -
Source/OWSpellingPerContactPlugin.h | 1 -
Source/OWSpellingPerContactPlugin.m | 1 -
Source/RAFBlockEditorPlugin.h | 1 -
Source/SAContactOnlineForPlugin.h | 1 -
Source/SMContactListShowBehaviorPlugin.h | 1 -
267 files changed, 71 insertions(+), 411 deletions(-)
diffs (truncated from 3241 to 1000 lines):
diff -r 14f474ebb80f -r 0ed90a175f06 .hgignore
--- a/.hgignore Wed Apr 22 18:55:56 2009 -0400
+++ b/.hgignore Thu Apr 23 12:45:33 2009 -0400
@@ -6,3 +6,4 @@
Utilities/build
Utilities/dep-build-scripts/build
Utilities/dep-build-scripts/source
+Utilities/dep-build-scripts/framework_maker/*.pyc
diff -r 14f474ebb80f -r 0ed90a175f06 Adium.pch
--- a/Adium.pch Wed Apr 22 18:55:56 2009 -0400
+++ b/Adium.pch Thu Apr 23 12:45:33 2009 -0400
@@ -20,4 +20,6 @@
#import <Adium/ESDebugAILog.h> //Everybody needs to debug
#import <AIUtilities/AIStringUtilities.h> //Everybody should be localizing their strings
#import <Adium/AILocalizationAssistance.h> //Everybody should be localizing their strings
+ #import <Adium/AIPreferenceControllerProtocol.h> //Just about everyone needs prefs
+ #import <Adium/AIPlugin.h> //We use plugins for almost everything
#endif
diff -r 14f474ebb80f -r 0ed90a175f06 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Wed Apr 22 18:55:56 2009 -0400
+++ b/Adium.xcodeproj/project.pbxproj Thu Apr 23 12:45:33 2009 -0400
@@ -3826,7 +3826,6 @@
4947F5ED0655E90C00B791E5 /* AWEzvDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvDefines.h; sourceTree = "<group>"; };
4947F5EE0655E90C00B791E5 /* AWEzvSupportRoutines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvSupportRoutines.h; sourceTree = "<group>"; };
4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AWEzvSupportRoutines.m; sourceTree = "<group>"; };
- 4947F5F00655E90D00B791E5 /* libezv_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libezv_Prefix.h; sourceTree = "<group>"; };
4947F5F20655E90D00B791E5 /* AWEzvContactManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvContactManager.h; sourceTree = "<group>"; };
4947F5F30655E90D00B791E5 /* AWEzvContactManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AWEzvContactManager.m; sourceTree = "<group>"; };
4947F5F40655E90D00B791E5 /* AWEzvContactManagerListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AWEzvContactManagerListener.h; sourceTree = "<group>"; };
@@ -6474,7 +6473,6 @@
4947F5ED0655E90C00B791E5 /* AWEzvDefines.h */,
4947F5EE0655E90C00B791E5 /* AWEzvSupportRoutines.h */,
4947F5EF0655E90D00B791E5 /* AWEzvSupportRoutines.m */,
- 4947F5F00655E90D00B791E5 /* libezv_Prefix.h */,
);
path = "Other Sources";
sourceTree = "<group>";
@@ -12325,12 +12323,6 @@
349C2F230867ACA9000BF883 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
PRODUCT_NAME = AdiumApplescriptRunner;
};
name = Debug;
@@ -12338,12 +12330,6 @@
349C2F240867ACA9000BF883 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
PRODUCT_NAME = AdiumApplescriptRunner;
};
name = Release;
@@ -12351,12 +12337,6 @@
349C2F250867ACA9000BF883 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_LDFLAGS = (
- "-framework",
- Foundation,
- "-framework",
- AppKit,
- );
PRODUCT_NAME = AdiumApplescriptRunner;
};
name = "Release-Debug";
@@ -12558,7 +12538,6 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
- GCC_DYNAMIC_NO_PIC = NO;
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
@@ -12589,7 +12568,6 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
- GCC_DYNAMIC_NO_PIC = NO;
HEADER_SEARCH_PATHS = (
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
@@ -12623,7 +12601,7 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(BUILT_PRODUCTS_DIR)\"";
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks/**\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks\"";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -12667,7 +12645,7 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(BUILT_PRODUCTS_DIR)\"";
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks/**\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks\"";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = used;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -12711,7 +12689,7 @@
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)",
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(BUILT_PRODUCTS_DIR)\"";
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks/**\"";
+ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/Frameworks\"";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DEBUGGING_SYMBOLS = default;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIArrayAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,8 +6,6 @@
// Copyright 2005 The Adium Team. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
@interface NSArray (AIArrayAdditions)
- (BOOL)containsObjectIdenticalTo:(id)obj;
+ (NSArray *)arrayNamed:(NSString *)name forClass:(Class)inClass;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AICharacterSetAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -5,8 +5,6 @@
// Created by Evan Schoenberg on 3/27/06.
//
-#import <Cocoa/Cocoa.h>
-
@interface NSCharacterSet (AICharacterSetAdditions)
- (NSCharacterSet *)immutableCopy;
@end
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIDividedAlternatingRowOutlineView.h
--- a/Frameworks/AIUtilities Framework/Source/AIDividedAlternatingRowOutlineView.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIDividedAlternatingRowOutlineView.h Thu Apr 23 12:45:33 2009 -0400
@@ -13,7 +13,6 @@
| write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
\------------------------------------------------------------------------------------------------------ */
-#import <Cocoa/Cocoa.h>
#import <AIUtilities/AIAlternatingRowOutlineView.h>
/*!
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIDockingWindow.h
--- a/Frameworks/AIUtilities Framework/Source/AIDockingWindow.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIDockingWindow.h Thu Apr 23 12:45:33 2009 -0400
@@ -18,8 +18,6 @@
#define AIWindowToolbarDidToggleVisibility @"AIWindowToolbarDidToggleVisibility"
-#import <Cocoa/Cocoa.h>
-
@interface AIDockingWindow : NSWindow {
NSRect oldWindowFrame;
unsigned int resisted_XMotion;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIEventAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIEventAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIEventAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -13,8 +13,6 @@
| write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
\------------------------------------------------------------------------------------------------------ */
-#import <Cocoa/Cocoa.h>
-
@interface NSEvent (AIEventAdditions)
+ (BOOL)cmdKey;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h
--- a/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.h Thu Apr 23 12:45:33 2009 -0400
@@ -5,8 +5,6 @@
// Created by Mac-arena the Bored Zo on 2005-02-11.
//
-#import <Cocoa/Cocoa.h>
-
@class AIHostReachabilityMonitor;
@protocol AIHostReachabilityObserver <NSObject>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -5,8 +5,6 @@
// Created by Evan Schoenberg on 2/11/08.
//
-#import <Cocoa/Cocoa.h>
-
typedef enum {
IMAGE_POSITION_LEFT = 0,
IMAGE_POSITION_RIGHT,
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIPasteboardAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIPasteboardAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIPasteboardAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -5,8 +5,6 @@
// Created by Evan Schoenberg on 5/26/08.
//
-#import <Cocoa/Cocoa.h>
-
#define AIiTunesTrackPboardType @"CorePasteboardFlavorType 0x6974756E" /* CorePasteboardFlavorType 'itun' */
@interface NSPasteboard (AIPasteboardAdditions)
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,9 +6,6 @@
// Copyright 2005 __MyCompanyName__. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
-
@interface NSTextAttachment (AITextAttachmentAdditions)
- (BOOL)wrapsImage;
@end
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AITextViewAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AITextViewAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AITextViewAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -7,9 +7,6 @@
//
//
-#import <Cocoa/Cocoa.h>
-
-
@interface NSTextView (AITextViewAdditions)
@end
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.h Thu Apr 23 12:45:33 2009 -0400
@@ -3,12 +3,9 @@
// AIUtilities.framework
//
// Created by David Smith on 9/16/06.
-// Copyright 2006 __MyCompanyName__. All rights reserved.
+// Copyright 2006-2009 The Adium Team. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
-
@interface NSWindowController (AIWindowControllerAdditions)
- (BOOL) canCustomizeToolbar;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAAtomicList.h
--- a/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAAtomicList.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAAtomicList.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,9 +6,6 @@
// Copyright 2008 Rogue Amoeba Software, LLC. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
-
// thread safe linked list utilities
// a NULL list is considered empty
typedef struct RAAtomicListNode *RAAtomicListRef;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/RAOperationQueue/RALatchTrigger.h
--- a/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RALatchTrigger.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RALatchTrigger.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,10 +6,8 @@
// Copyright 2008 Rogue Amoeba Software, LLC. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
#import <mach/port.h>
-
/*
A lockless mostly non-blocking latching trigger class.
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperation.h
--- a/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperation.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperation.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,9 +6,6 @@
// Copyright 2008 Rogue Amoeba Software, LLC. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
-
@interface RAOperation : NSObject
{
}
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperationQueue.h
--- a/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperationQueue.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/RAOperationQueue/RAOperationQueue.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,9 +6,6 @@
// Copyright 2008 Rogue Amoeba Software, LLC. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
-
@class RAOperation;
@class RAOperationQueueImpl;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m Thu Apr 23 12:45:33 2009 -0400
@@ -23,7 +23,6 @@
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
#import <Adium/AIStatusControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIChat.h>
#import <Adium/AIContentEvent.h>
#import <Adium/AIListContact.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m Thu Apr 23 12:45:33 2009 -0400
@@ -17,7 +17,6 @@
#import <Adium/AIAbstractListController.h>
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIListCell.h>
#import <Adium/AIListContactBubbleCell.h>
#import <Adium/AIListContactBubbleToFitCell.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAccount.m
--- a/Frameworks/Adium Framework/Source/AIAccount.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccount.m Thu Apr 23 12:45:33 2009 -0400
@@ -29,7 +29,6 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIAccountControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import "DCJoinChatViewController.h"
#import "AIChatControllerProtocol.h"
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m
--- a/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Thu Apr 23 12:45:33 2009 -0400
@@ -18,7 +18,6 @@
#import <Adium/AIAccountControllerProtocol.h>
#import <Adium/AIAccountPlusFieldPromptController.h>
#import <Adium/AIContactControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIContentMessage.h>
#import <Adium/AIListContact.h>
#import <Adium/AIService.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m Thu Apr 23 12:45:33 2009 -0400
@@ -21,7 +21,6 @@
#import <Adium/AIAccountControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIContactControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
#import <AIUtilities/AIMenuAdditions.h>
#import <AIUtilities/AIPopUpButtonAdditions.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Thu Apr 23 12:45:33 2009 -0400
@@ -17,7 +17,6 @@
#import "AIAddressBookController.h"
#import <Adium/AIControllerProtocol.h>
#import <Adium/AIAccountControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIMenuControllerProtocol.h>
#import <Adium/AIAccount.h>
#import <Adium/AIListObject.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAddressBookUserIconSource.m Thu Apr 23 12:45:33 2009 -0400
@@ -7,7 +7,6 @@
#import "AIAddressBookUserIconSource.h"
#import "AIAddressBookController.h"
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AddressBook/AddressBook.h>
#import <Adium/AIUserIcons.h>
#import <Adium/AIMetaContact.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m
--- a/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m Thu Apr 23 12:45:33 2009 -0400
@@ -6,7 +6,6 @@
//
#import "AIAdvancedPreferencePane.h"
-#import <Adium/AIPreferenceControllerProtocol.h>
@implementation AIAdvancedPreferencePane
//Return a new preference pane
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIChat.m Thu Apr 23 12:45:33 2009 -0400
@@ -28,7 +28,6 @@
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIChatControllerProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AISortController.h>
#import <AIUtilities/AIArrayAdditions.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIContactHidingController.m
--- a/Frameworks/Adium Framework/Source/AIContactHidingController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIContactHidingController.m Thu Apr 23 12:45:33 2009 -0400
@@ -18,7 +18,6 @@
#import <Adium/AIListObject.h>
#import <Adium/AIListGroup.h>
#import <Adium/AIMetaContact.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIListBookmark.h>
#import <Adium/AIService.h>
#import "AIContactController.h"
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AICorePluginLoader.m
--- a/Frameworks/Adium Framework/Source/AICorePluginLoader.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AICorePluginLoader.m Thu Apr 23 12:45:33 2009 -0400
@@ -25,7 +25,6 @@
#import <Adium/AICorePluginLoader.h>
#import <AIUtilities/AIFileManagerAdditions.h>
#import <AIUtilities/AIApplicationAdditions.h>
-#import <Adium/AIPlugin.h>
#define DIRECTORY_INTERNAL_PLUGINS [@"Contents" stringByAppendingPathComponent:@"PlugIns"] //Path to the internal plugins
#define EXTERNAL_PLUGIN_FOLDER @"PlugIns" //Folder name of external plugins
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIEditStateWindowController.m
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Thu Apr 23 12:45:33 2009 -0400
@@ -19,7 +19,6 @@
#import <Adium/AIStatus.h>
#import <Adium/AIStatusControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
#import <AIUtilities/AIAutoScrollView.h>
#import <AIUtilities/AIStringFormatter.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIGroupChatStatusIcons.m
--- a/Frameworks/Adium Framework/Source/AIGroupChatStatusIcons.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIGroupChatStatusIcons.m Thu Apr 23 12:45:33 2009 -0400
@@ -7,7 +7,6 @@
#import "AIGroupChatStatusIcons.h"
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AIUtilities/AIColorAdditions.h>
@interface AIGroupChatStatusIcons()
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h Thu Apr 23 12:45:33 2009 -0400
@@ -7,7 +7,6 @@
*/
#import <Adium/AIControllerProtocol.h>
-#import <Adium/AIPlugin.h>
#define Interface_ContactSelectionChanged @"Interface_ContactSelectionChanged"
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIListContact.m
--- a/Frameworks/Adium Framework/Source/AIListContact.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListContact.m Thu Apr 23 12:45:33 2009 -0400
@@ -18,7 +18,6 @@
#import <Adium/AIChatControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIStatusControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIContentMessage.h>
#import <Adium/AIListContact.h>
#import <Adium/AIContactList.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIListGroup.m
--- a/Frameworks/Adium Framework/Source/AIListGroup.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListGroup.m Thu Apr 23 12:45:33 2009 -0400
@@ -21,7 +21,6 @@
#import <Adium/AIContactList.h>
#import <Adium/AIListContact.h>
#import <Adium/AIContactHidingController.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#define PREF_GROUP_CONTACT_LIST_DISPLAY @"Contact List Display"
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Thu Apr 23 12:45:33 2009 -0400
@@ -18,7 +18,6 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIListContact.h>
#import <Adium/AIListGroup.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIService.h>
#import <Adium/AIUserIcons.h>
#import <AIUtilities/AIMutableOwnerArray.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.h
--- a/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,5 +6,4 @@
// Copyright 2009 Adium X / Saltatory Software. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
#import <Adium/AIListOutlineView.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIListOutlineView.m
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.m Thu Apr 23 12:45:33 2009 -0400
@@ -15,7 +15,6 @@
*/
#import "AIContactController.h"
#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIListCell.h>
#import <Adium/AIListOutlineView.h>
#import <Adium/AIListGroup.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Thu Apr 23 12:45:33 2009 -0400
@@ -15,7 +15,6 @@
*/
#import <AIUtilities/AISendingTextView.h>
-#import <Adium/AIAdiumProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
#import <Adium/AIContactObserverManager.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Thu Apr 23 12:45:33 2009 -0400
@@ -19,7 +19,6 @@
#import <Adium/AIListObject.h>
#import <Adium/AIListContact.h>
#import <Adium/AIMessageEntryTextView.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/ESFileWrapperExtension.h>
#import <Adium/AITextAttachmentExtension.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIPlugin.m
--- a/Frameworks/Adium Framework/Source/AIPlugin.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIPlugin.m Thu Apr 23 12:45:33 2009 -0400
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <Adium/AIPlugin.h>
@implementation AIPlugin
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIPreferencePane.h
--- a/Frameworks/Adium Framework/Source/AIPreferencePane.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIPreferencePane.h Thu Apr 23 12:45:33 2009 -0400
@@ -15,7 +15,6 @@
*/
#import <Adium/AIModularPane.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/SS_PreferencePaneProtocol.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIProxyListObject.h
--- a/Frameworks/Adium Framework/Source/AIProxyListObject.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIProxyListObject.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,8 +6,6 @@
// Copyright 2009 Adium X / Saltatory Software. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
@class ESObjectWithProperties;
@protocol AIContainingObject;
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIServiceIcons.m
--- a/Frameworks/Adium Framework/Source/AIServiceIcons.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIServiceIcons.m Thu Apr 23 12:45:33 2009 -0400
@@ -17,7 +17,6 @@
#import <Adium/AIListObject.h>
#import <Adium/AIService.h>
#import <Adium/AIServiceIcons.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
static NSMutableDictionary *serviceIcons[NUMBER_OF_SERVICE_ICON_TYPES][NUMBER_OF_ICON_DIRECTIONS];
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AISortController.m
--- a/Frameworks/Adium Framework/Source/AISortController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AISortController.m Thu Apr 23 12:45:33 2009 -0400
@@ -17,7 +17,6 @@
#import <Adium/AIListContact.h>
#import <Adium/AIListGroup.h>
#import <Adium/AISortController.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIContactControllerProtocol.h>
#import <AIUtilities/AIStringAdditions.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIStatusItem.m
--- a/Frameworks/Adium Framework/Source/AIStatusItem.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIStatusItem.m Thu Apr 23 12:45:33 2009 -0400
@@ -10,7 +10,6 @@
#import <Adium/AIStatusIcons.h>
#import <Adium/AIAccountControllerProtocol.h>
#import <Adium/AIStatusControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AIUtilities/AIStringAdditions.h>
/*!
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIStatusMenu.m
--- a/Frameworks/Adium Framework/Source/AIStatusMenu.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIStatusMenu.m Thu Apr 23 12:45:33 2009 -0400
@@ -15,7 +15,6 @@
#import <Adium/AISocialNetworkingStatusMenu.h>
#import <Adium/AIAccountControllerProtocol.h>
#import <Adium/AIMenuControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <AIUtilities/AIArrayAdditions.h>
#import <AIUtilities/AIEventAdditions.h>
#import <AIUtilities/AIMenuAdditions.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIUserIcons.m
--- a/Frameworks/Adium Framework/Source/AIUserIcons.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIUserIcons.m Thu Apr 23 12:45:33 2009 -0400
@@ -18,7 +18,6 @@
#import <Adium/AIListObject.h>
#import <Adium/AIMetaContact.h>
#import <Adium/AIUserIcons.h>
-#import <Adium/AIAdiumProtocol.h>
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIContactObserverManager.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIWindowController.h
--- a/Frameworks/Adium Framework/Source/AIWindowController.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIWindowController.h Thu Apr 23 12:45:33 2009 -0400
@@ -13,8 +13,6 @@
* You should have received a copy of the GNU General Public License along with this program; if not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
-#import <Adium/AIAdiumProtocol.h>
@interface AIWindowController : NSWindowController {
}
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/AIWindowController.m
--- a/Frameworks/Adium Framework/Source/AIWindowController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIWindowController.m Thu Apr 23 12:45:33 2009 -0400
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIWindowController.h>
#import <AIUtilities/AIApplicationAdditions.h>
#import <AIUtilities/AIWindowAdditions.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/ESApplescriptabilityController.m
--- a/Frameworks/Adium Framework/Source/ESApplescriptabilityController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/ESApplescriptabilityController.m Thu Apr 23 12:45:33 2009 -0400
@@ -19,7 +19,6 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import "AIStatusController.h"
#import "ESApplescriptabilityController.h"
#import "AdiumApplescriptRunner.h"
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/ESContactAlertsViewController.m
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Thu Apr 23 12:45:33 2009 -0400
@@ -17,7 +17,6 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIListObject.h>
#import <Adium/AIListContact.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/CSNewContactAlertWindowController.h>
#import <Adium/AIContactAlertsControllerProtocol.h>
#import <Adium/ESContactAlertsViewController.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/ESDebugAILog.m
--- a/Frameworks/Adium Framework/Source/ESDebugAILog.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/ESDebugAILog.m Thu Apr 23 12:45:33 2009 -0400
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <Adium/ESDebugAILog.h>
#import <Adium/AIDebugControllerProtocol.h>
#include <stdarg.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h
--- a/Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/Adium Framework/Source/SS_PreferencePaneProtocol.h Thu Apr 23 12:45:33 2009 -0400
@@ -1,5 +1,3 @@
-#import <Cocoa/Cocoa.h>
-
@protocol SS_PreferencePaneProtocol
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/ShortcutRecorder/Source/SRCommon.h
--- a/Frameworks/ShortcutRecorder/Source/SRCommon.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/ShortcutRecorder/Source/SRCommon.h Thu Apr 23 12:45:33 2009 -0400
@@ -11,9 +11,7 @@
// Jesper
// Jamie Kirkpatrick
-#import <Cocoa/Cocoa.h>
#import <Carbon/Carbon.h>
-#import <CoreServices/CoreServices.h>
#pragma mark Dummy class
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/ShortcutRecorder/Source/SRKeyCodeTransformer.h
--- a/Frameworks/ShortcutRecorder/Source/SRKeyCodeTransformer.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/ShortcutRecorder/Source/SRKeyCodeTransformer.h Thu Apr 23 12:45:33 2009 -0400
@@ -11,6 +11,4 @@
// Jesper
// Jamie Kirkpatrick
-#import <Cocoa/Cocoa.h>
-
@interface SRKeyCodeTransformer : NSValueTransformer {} @end
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/ShortcutRecorder/Source/SRRecorderCell.h
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderCell.h Thu Apr 23 12:45:33 2009 -0400
@@ -11,7 +11,6 @@
// Jesper
// Jamie Kirkpatrick
-#import <Cocoa/Cocoa.h>
#import "SRCommon.h"
#define SRMinWidth 50
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/ShortcutRecorder/Source/SRRecorderControl.h
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderControl.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderControl.h Thu Apr 23 12:45:33 2009 -0400
@@ -11,7 +11,6 @@
// Jesper
// Jamie Kirkpatrick
-#import <Cocoa/Cocoa.h>
#import "SRRecorderCell.h"
@interface SRRecorderControl : NSControl
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/ShortcutRecorder/Source/SRValidator.h
--- a/Frameworks/ShortcutRecorder/Source/SRValidator.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/ShortcutRecorder/Source/SRValidator.h Thu Apr 23 12:45:33 2009 -0400
@@ -11,8 +11,6 @@
// Jesper
// Jamie Kirkpatrick
-#import <Cocoa/Cocoa.h>
-
@interface SRValidator : NSObject {
id delegate;
}
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/libpurple.framework/Versions/0.6.0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/marshallers.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/marshallers.h Thu Apr 23 12:45:33 2009 -0400
@@ -6,7 +6,7 @@
G_BEGIN_DECLS
-/* VOID:POINTER,POINTER,OBJECT (/Sources/adium/Utilities/dep-build-scripts/source/im.pidgin.adium/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Sources/im.pidgin.adium/libpurple/marshallers.list:1) */
extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -14,7 +14,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:OBJECT,POINTER,STRING (/Sources/adium/Utilities/dep-build-scripts/source/im.pidgin.adium/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Sources/im.pidgin.adium/libpurple/marshallers.list:2) */
extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -22,7 +22,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING (/Sources/adium/Utilities/dep-build-scripts/source/im.pidgin.adium/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Sources/im.pidgin.adium/libpurple/marshallers.list:3) */
extern void purple_smarshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -30,7 +30,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING (/Sources/adium/Utilities/dep-build-scripts/source/im.pidgin.adium/libpurple/marshallers.list:4) */
+/* VOID:ENUM,STRING,STRING (/Sources/im.pidgin.adium/libpurple/marshallers.list:4) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -38,7 +38,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Sources/adium/Utilities/dep-build-scripts/source/im.pidgin.adium/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Sources/im.pidgin.adium/libpurple/marshallers.list:5) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/plugin.h Thu Apr 23 12:45:33 2009 -0400
@@ -105,6 +105,20 @@
void *ui_info; /**< Used only by UI-specific plugins to build a preference screen with a custom UI */
void *extra_info;
PurplePluginUiInfo *prefs_info; /**< Used by any plugin to display preferences. If #ui_info has been specified, this will be ignored. */
+
+ /**
+ * This callback has a different use depending on whether this
+ * plugin type is PURPLE_PLUGIN_STANDARD or PURPLE_PLUGIN_PROTOCOL.
+ *
+ * If PURPLE_PLUGIN_STANDARD then the list of actions will show up
+ * in the Tools menu, under a submenu with the name of the plugin.
+ * context will be NULL.
+ *
+ * If PURPLE_PLUGIN_PROTOCOL then the list of actions will show up
+ * in the Accounts menu, under a submenu with the name of the
+ * account. context will be set to the PurpleConnection for that
+ * account. This callback will only be called for online accounts.
+ */
GList *(*actions)(PurplePlugin *plugin, gpointer context);
void (*_purple_reserved1)(void);
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Thu Apr 23 12:45:33 2009 -0400
@@ -1,38 +1,38 @@
-/*
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here. Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
- *
- */
-
-
-#include "internal.h"
-
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "debug.h"
-#include "util.h"
-#include "version.h"
-#include "yahoo.h"
-#include "yahoo_packet.h"
-
-void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
-void yahoo_fetch_aliases(PurpleConnection *gc);
-
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ *
+ */
+
+
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "debug.h"
+#include "util.h"
+#include "version.h"
+#include "yahoo.h"
+#include "yahoo_packet.h"
+
+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
+void yahoo_fetch_aliases(PurpleConnection *gc);
+
diff -r 14f474ebb80f -r 0ed90a175f06 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Bonjour/AWBonjourPlugin.h
--- a/Plugins/Bonjour/AWBonjourPlugin.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Bonjour/AWBonjourPlugin.h Thu Apr 23 12:45:33 2009 -0400
@@ -22,7 +22,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <Adium/AIPlugin.h>
@interface AWBonjourPlugin : AIPlugin {
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h
--- a/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h Thu Apr 23 12:45:33 2009 -0400
@@ -1,4 +1,3 @@
-#import <Cocoa/Cocoa.h>
#import "AWEzvContact.h"
typedef enum {
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Bonjour/libezv/Other Sources/libezv_Prefix.h
--- a/Plugins/Bonjour/libezv/Other Sources/libezv_Prefix.h Wed Apr 22 18:55:56 2009 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Project: Libezv
- * File: libezv_Prefix.h
- * Prefix header for all source files of the 'libezv' target.
- *
- * Version: 1.0
- * Author: Andrew Wellington <proton[at]wiretapped.net>
- *
- * License:
- * Copyright (C) 2004-2005 Andrew Wellington.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
-#endif
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Bonjour/libezv/Simple HTTP Server/HTTPAuthenticationRequest.h
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPAuthenticationRequest.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPAuthenticationRequest.h Thu Apr 23 12:45:33 2009 -0400
@@ -1,5 +1,3 @@
-#import <Cocoa/Cocoa.h>
-
@interface HTTPAuthenticationRequest : NSObject
{
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.h Thu Apr 23 12:45:33 2009 -0400
@@ -1,4 +1,3 @@
-#import <Cocoa/Cocoa.h>
@class EKEzvOutgoingFileTransfer, AsyncSocket;
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.h
--- a/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.h Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.h Thu Apr 23 12:45:33 2009 -0400
@@ -14,7 +14,6 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#import <Adium/AIPlugin.h>
#import <Adium/AIContactObserverManager.h>
#import <Adium/AIContactAlertsControllerProtocol.h>
#import <Adium/AIChatControllerProtocol.h>
diff -r 14f474ebb80f -r 0ed90a175f06 Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m
--- a/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m Wed Apr 22 18:55:56 2009 -0400
+++ b/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m Thu Apr 23 12:45:33 2009 -0400
@@ -20,7 +20,6 @@
#import <Adium/AIContentControllerProtocol.h>
#import "AIDockController.h"
#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
#import <Adium/AIContactAlertsControllerProtocol.h>
More information about the commits
mailing list