adium 5395:3b7b6579a02c: Horrible merge of adium-1.6 into default.
commits at adium.im
commits at adium.im
Wed Mar 20 00:37:56 UTC 2013
details: http://hg.adium.im/adium/rev/3b7b6579a02c
revision: 5395:3b7b6579a02c
branch: (none)
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Mar 20 01:37:36 2013 +0100
Horrible merge of adium-1.6 into default.
diffs (612 lines):
diff -r 60978fed42ec -r 3b7b6579a02c Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Mar 19 10:44:19 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj Wed Mar 20 01:37:36 2013 +0100
@@ -1344,6 +1344,9 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+ 761CE33916F9087C000EE361 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 761CE33816F9087C000EE361 /* Cocoa.framework */; };
+ 761CE34E16F90950000EE361 /* AIDockTilePlugin.docktileplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */; };
+ 761CE35416F90A03000EE361 /* AIDockTile.m in Sources */ = {isa = PBXBuildFile; fileRef = 761CE35316F90A03000EE361 /* AIDockTile.m */; };
761D58801636C60100210B12 /* AINewMessageTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D587F1636C60100210B12 /* AINewMessageTableView.m */; };
761D58831636EDE100210B12 /* AINewMessageTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58821636EDE100210B12 /* AINewMessageTextFieldCell.m */; };
761D58861636F94300210B12 /* AINewMessageSearchField.m in Sources */ = {isa = PBXBuildFile; fileRef = 761D58851636F94200210B12 /* AINewMessageSearchField.m */; };
@@ -1635,6 +1638,13 @@
remoteGlobalIDString = 76B73B1D14BE287D00A58BAB;
remoteInfo = AIApplescriptRunner;
};
+ 761CE34F16F9098E000EE361 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 761CE33516F9087C000EE361;
+ remoteInfo = AIDockTilePlugin;
+ };
7E78DA9B0DD135DE00B9388F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */;
@@ -1740,6 +1750,16 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE34D16F90938000EE361 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 13;
+ files = (
+ 761CE34E16F90950000EE361 /* AIDockTilePlugin.docktileplugin in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
F51BCD3E0A156281000FDC06 /* Copy Spotlight Importer */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -4393,6 +4413,15 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AIDockTilePlugin.docktileplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+ 761CE33816F9087C000EE361 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+ 761CE33B16F9087C000EE361 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+ 761CE33C16F9087C000EE361 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+ 761CE33D16F9087C000EE361 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+ 761CE34016F9087D000EE361 /* AIDockTilePlugin-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AIDockTilePlugin-Info.plist"; sourceTree = "<group>"; };
+ 761CE34416F9087D000EE361 /* AIDockTilePlugin-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AIDockTilePlugin-Prefix.pch"; sourceTree = "<group>"; };
+ 761CE35216F90A03000EE361 /* AIDockTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDockTile.h; path = Source/AIDockTile.h; sourceTree = "<group>"; };
+ 761CE35316F90A03000EE361 /* AIDockTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIDockTile.m; path = Source/AIDockTile.m; sourceTree = "<group>"; };
761D587E1636C60100210B12 /* AINewMessageTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTableView.h; path = Source/AINewMessageTableView.h; sourceTree = "<group>"; };
761D587F1636C60100210B12 /* AINewMessageTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessageTableView.m; path = Source/AINewMessageTableView.m; sourceTree = "<group>"; };
761D58811636EDE100210B12 /* AINewMessageTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AINewMessageTextFieldCell.h; path = Source/AINewMessageTextFieldCell.h; sourceTree = "<group>"; };
@@ -4867,6 +4896,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33316F9087C000EE361 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 761CE33916F9087C000EE361 /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -5099,6 +5136,7 @@
6334FBFC0F9C11DC003C77A9 /* AIUtilities.framework */,
633D4FA40F9D3073004F491E /* AdiumSpotlightImporter.mdimporter */,
76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */,
+ 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */,
);
name = Products;
sourceTree = "<group>";
@@ -5122,6 +5160,8 @@
312ED3D80C7E89CC00A6BDA9 /* Unit tests */,
29B97323FDCFA39411CA2CEA /* Linked Frameworks */,
63C7E0280FAF9B7D00B310AC /* xcconfigs */,
+ 761CE33E16F9087C000EE361 /* Dock Tile */,
+ 761CE33716F9087C000EE361 /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
name = CocAIMe2;
@@ -8146,6 +8186,52 @@
path = AIApplescriptRunner;
sourceTree = "<group>";
};
+ 761CE33716F9087C000EE361 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE33816F9087C000EE361 /* Cocoa.framework */,
+ 761CE33A16F9087C000EE361 /* Other Frameworks */,
+ );
+ name = Frameworks;
+ };
+ 761CE33A16F9087C000EE361 /* Other Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE33B16F9087C000EE361 /* AppKit.framework */,
+ 761CE33C16F9087C000EE361 /* CoreData.framework */,
+ 761CE33D16F9087C000EE361 /* Foundation.framework */,
+ );
+ name = "Other Frameworks";
+ sourceTree = "<group>";
+ };
+ 761CE33E16F9087C000EE361 /* Dock Tile */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE35116F909C1000EE361 /* Source */,
+ 761CE33F16F9087D000EE361 /* Supporting Files */,
+ );
+ name = "Dock Tile";
+ path = "Other/Adium Dock Tile Plugin";
+ sourceTree = SOURCE_ROOT;
+ };
+ 761CE33F16F9087D000EE361 /* Supporting Files */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE34016F9087D000EE361 /* AIDockTilePlugin-Info.plist */,
+ 761CE34416F9087D000EE361 /* AIDockTilePlugin-Prefix.pch */,
+ );
+ name = "Supporting Files";
+ sourceTree = "<group>";
+ };
+ 761CE35116F909C1000EE361 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ 761CE35216F90A03000EE361 /* AIDockTile.h */,
+ 761CE35316F90A03000EE361 /* AIDockTile.m */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
76FF925C14B60B4B0043E23B /* Console */ = {
isa = PBXGroup;
children = (
@@ -9265,6 +9351,7 @@
34BD9D24053146CC000AB133 /* Resources */,
34BD9D57053146CC000AB133 /* Frameworks */,
F51BCD3E0A156281000FDC06 /* Copy Spotlight Importer */,
+ 761CE34D16F90938000EE361 /* CopyFiles */,
34BD9D5F053146CC000AB133 /* Copy Frameworks */,
4BF2E91F067CB76300743318 /* Copy Built-in Xtras */,
34BD9D6A053146CC000AB133 /* Copy AdiumPlugins */,
@@ -9276,6 +9363,7 @@
);
dependencies = (
76B73B3214BE2A5200A58BAB /* PBXTargetDependency */,
+ 761CE35016F9098E000EE361 /* PBXTargetDependency */,
11F6CB2E109BC6AC0070022D /* PBXTargetDependency */,
639DF9E30F97E687003C9A32 /* PBXTargetDependency */,
6329EFB50F9D33A600112489 /* PBXTargetDependency */,
@@ -9362,6 +9450,23 @@
productReference = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */;
productType = "com.apple.product-type.bundle";
};
+ 761CE33516F9087C000EE361 /* AIDockTilePlugin */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 761CE34B16F9087D000EE361 /* Build configuration list for PBXNativeTarget "AIDockTilePlugin" */;
+ buildPhases = (
+ 761CE33216F9087C000EE361 /* Sources */,
+ 761CE33316F9087C000EE361 /* Frameworks */,
+ 761CE33416F9087C000EE361 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = AIDockTilePlugin;
+ productName = AIDockTilePlugin;
+ productReference = 761CE33616F9087C000EE361 /* AIDockTilePlugin.docktileplugin */;
+ productType = "com.apple.product-type.bundle";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -9436,6 +9541,7 @@
312ED3C90C7E875B00A6BDA9 /* Unit tests */,
633D4FA30F9D3073004F491E /* Spotlight Importer */,
76B73B1D14BE287D00A58BAB /* AIApplescriptRunner */,
+ 761CE33516F9087C000EE361 /* AIDockTilePlugin */,
);
};
/* End PBXProject section */
@@ -9903,6 +10009,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33416F9087C000EE361 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@@ -10721,6 +10834,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ 761CE33216F9087C000EE361 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 761CE35416F90A03000EE361 /* AIDockTile.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
@@ -10784,6 +10905,11 @@
target = 76B73B1D14BE287D00A58BAB /* AIApplescriptRunner */;
targetProxy = 76B73B3114BE2A5200A58BAB /* PBXContainerItemProxy */;
};
+ 761CE35016F9098E000EE361 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 761CE33516F9087C000EE361 /* AIDockTilePlugin */;
+ targetProxy = 761CE34F16F9098E000EE361 /* PBXContainerItemProxy */;
+ };
F5B17CDF0A16C767004AE99E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = F5B17CCF0A16C6AC004AE99E /* Plist Macros */;
@@ -12401,6 +12527,14 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -12428,6 +12562,37 @@
};
name = Debug;
};
+ 761CE34516F9087D000EE361 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COPY_PHASE_STRIP = NO;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Prefix.pch";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Info.plist";
+ INSTALL_PATH = Contents/PlugIns;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ ONLY_ACTIVE_ARCH = YES;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = docktileplugin;
+ };
+ name = Debug;
+ };
76B73B2D14BE287D00A58BAB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -12453,6 +12618,38 @@
};
name = Release;
};
+ 761CE34616F9087D000EE361 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COMBINE_HIDPI_IMAGES = YES;
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Prefix.pch";
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Info.plist";
+ INSTALL_PATH = Contents/PlugIns;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = docktileplugin;
+ };
+ name = Release;
+ };
76B73B2E14BE287D00A58BAB /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -12478,6 +12675,38 @@
};
name = "Release-Debug";
};
+ 761CE34716F9087D000EE361 /* Release-Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COMBINE_HIDPI_IMAGES = YES;
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Prefix.pch";
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ INFOPLIST_FILE = "Other/Adium Dock Tile Plugin/AIDockTilePlugin-Info.plist";
+ INSTALL_PATH = Contents/PlugIns;
+ MACOSX_DEPLOYMENT_TARGET = 10.8;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = macosx;
+ WRAPPER_EXTENSION = docktileplugin;
+ };
+ name = "Release-Debug";
+ };
DADE8E00085507450062B664 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
@@ -12681,6 +12910,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
+ 761CE34B16F9087D000EE361 /* Build configuration list for PBXNativeTarget "AIDockTilePlugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 761CE34516F9087D000EE361 /* Debug */,
+ 761CE34616F9087D000EE361 /* Release */,
+ 761CE34716F9087D000EE361 /* Release-Debug */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Debug;
+ };
DADE8DFF085507450062B664 /* Build configuration list for PBXNativeTarget "Adium.Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff -r 60978fed42ec -r 3b7b6579a02c Other/Adium Dock Tile Plugin/AIDockTilePlugin-Info.plist
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Other/Adium Dock Tile Plugin/AIDockTilePlugin-Info.plist Wed Mar 20 01:37:36 2013 +0100
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>im.adium.${PRODUCT_NAME:rfc1034identifier}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>BNDL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>NSPrincipalClass</key>
+ <string>AIDockTile</string>
+</dict>
+</plist>
diff -r 60978fed42ec -r 3b7b6579a02c Other/Adium Dock Tile Plugin/AIDockTilePlugin-Prefix.pch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Other/Adium Dock Tile Plugin/AIDockTilePlugin-Prefix.pch Wed Mar 20 01:37:36 2013 +0100
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'AIDockTilePlugin' target in the 'AIDockTilePlugin' project
+//
+
+#ifdef __OBJC__
+ #import <Cocoa/Cocoa.h>
+#endif
diff -r 60978fed42ec -r 3b7b6579a02c Other/Adium Dock Tile Plugin/Source/AIDockTile.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Other/Adium Dock Tile Plugin/Source/AIDockTile.h Wed Mar 20 01:37:36 2013 +0100
@@ -0,0 +1,25 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/Foundation.h>
+
+ at interface AIDockTile : NSObject <NSDockTilePlugIn> {
+ NSMenu *dockMenu;
+}
+
+- (void)setDockTile:(NSDockTile *)inDockTile;
+
+ at end
diff -r 60978fed42ec -r 3b7b6579a02c Other/Adium Dock Tile Plugin/Source/AIDockTile.m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Other/Adium Dock Tile Plugin/Source/AIDockTile.m Wed Mar 20 01:37:36 2013 +0100
@@ -0,0 +1,87 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "AIDockTile.h"
+
+ at implementation AIDockTile
+
+- (void)setDockTile:(NSDockTile *)inDockTile
+{
+ if (!inDockTile) return;
+
+ CFPreferencesAppSynchronize(CFSTR("com.adiumX.adiumX"));
+ CFStringRef path = CFPreferencesCopyAppValue(CFSTR("DockTilePath"), CFSTR("com.adiumX.adiumX"));
+
+ if (!path) {
+ NSLog(@"AIDockTilePlugin: DockTilePath not found.");
+ return;
+ }
+
+ NSImage *image = [[[NSImage alloc] initByReferencingFile:(NSString *)path] autorelease];
+ NSImageView *view = [[[NSImageView alloc] init] autorelease];
+
+ [view setImage:image];
+ [inDockTile setContentView:view];
+ [inDockTile display];
+
+ CFRelease(path);
+}
+
+- (void)launchDebug
+{
+ NSString *path = [[NSBundle bundleForClass:[self class]] bundlePath];
+
+ NSMutableArray *pathComponents = [[[path pathComponents] mutableCopy] autorelease];
+
+ // PlugIns/AIDockTilePlugin.docktileplugin
+ [pathComponents removeLastObject];
+ [pathComponents removeLastObject];
+
+ NSString *adiumPath = [[[NSString pathWithComponents:pathComponents] stringByAppendingPathComponent:@"MacOS"] stringByAppendingPathComponent:@"Adium"];
+
+ NSTask *adiumTask = [[[NSTask alloc] init] autorelease];
+
+ [adiumTask setLaunchPath:adiumPath];
+ [adiumTask setArguments:@[@"--debug"]];
+
+ [adiumTask launch];
+}
+
+- (NSMenu *)dockMenu
+{
+ if (dockMenu) return dockMenu;
+
+ dockMenu = [[NSMenu alloc] init];
+ NSMenuItem *menuItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Launch in Debug Mode"
+ action:@selector(launchDebug)
+ keyEquivalent:@""];
+ menuItem.target = self;
+
+ [dockMenu addItem:menuItem];
+
+ [menuItem release];
+
+ return dockMenu;
+}
+
+- (void)dealloc
+{
+ [dockMenu release];
+
+ [super dealloc];
+}
+
+ at end
diff -r 60978fed42ec -r 3b7b6579a02c Plists/Info.plist
--- a/Plists/Info.plist Tue Mar 19 10:44:19 2013 +0100
+++ b/Plists/Info.plist Wed Mar 20 01:37:36 2013 +0100
@@ -496,6 +496,8 @@
<integer>86400</integer>
<key>SmartCrashReports_CompanyName</key>
<string>Adium</string>
+ <key>NSDockTilePlugIn</key>
+ <string>AIDockTilePlugin.docktileplugin</string>
<key>SmartCrashReports_EmailTicket</key>
<string>SCR-2631F8982F</string>
<key>UTExportedTypeDeclarations</key>
diff -r 60978fed42ec -r 3b7b6579a02c Source/AIDockController.m
--- a/Source/AIDockController.m Tue Mar 19 10:44:19 2013 +0100
+++ b/Source/AIDockController.m Wed Mar 20 01:37:36 2013 +0100
@@ -392,19 +392,20 @@
}
- (void)updateAppBundleIcon
-{
+{
NSImage *image = [[[availableIconStateDict objectForKey:@"State"] objectForKey:@"ApplicationIcon"] image];
if (!image)
image = [[[availableIconStateDict objectForKey:@"State"] objectForKey:@"Base"] image];
if (image) {
- [[NSWorkspace sharedWorkspace] setIcon:image
- forFile:[[NSBundle mainBundle] bundlePath]
- options:0];
+ NSData *imageData = [image TIFFRepresentation];
+ NSString *fileName = [adium.cachesPath stringByAppendingPathComponent:@"DockIcon.tiff"];
- //Finder won't update Adium's icon to match the new one until it is restarted if we don't
- //tell NSWorkspace to note the change.
- [[NSWorkspace sharedWorkspace] noteFileSystemChanged:[[NSBundle mainBundle] bundlePath]];
+ [imageData writeToFile:fileName
+ atomically:TRUE];
+
+ [[NSUserDefaults standardUserDefaults] setValue:fileName
+ forKey:@"DockTilePath"];
}
}
diff -r 60978fed42ec -r 3b7b6579a02c Source/AILoginController.m
--- a/Source/AILoginController.m Tue Mar 19 10:44:19 2013 +0100
+++ b/Source/AILoginController.m Wed Mar 20 01:37:36 2013 +0100
@@ -76,12 +76,19 @@
//Retrieve the desired user from the command line if possible
arguments = [[NSProcessInfo processInfo] arguments];
- if (arguments && ([arguments count] > 1)) {
+ if (arguments && ([arguments count] >= 1)) {
argumentIndex = [arguments indexOfObject:@"--user"];
if ((argumentIndex != NSNotFound) && ([arguments count] > argumentIndex + 1)) {
userName = [[arguments objectAtIndex:argumentIndex+1] copy];
}
+
+#ifndef DEBUG_BUILD
+ argumentIndex = [arguments indexOfObject:@"--debug"];
+ if (argumentIndex != NSNotFound) {
+ AIEnableDebugLogging();
+ }
+#endif
}
/*
More information about the commits
mailing list