[Adium-commits] adium 1995:4c61eb6882fd: Contact List: For some reason the borde...
adium-commits at adiumx.com
adium-commits at adiumx.com
Mon Apr 27 06:40:48 UTC 2009
details: http://hg.adiumx.com/adium/rev/4c61eb6882fd
revision: 1995:4c61eb6882fd
author: Colin Barrett <colin at springsandstruts.com>
date: Sun Apr 26 23:38:56 2009 -0700
Contact List: For some reason the borderless nib had the scroll view positioned at -1, -1 and was two pixels too wide & taller for its superview. I assume this was to get rid of some border, but I'm not seeing it anymore. Plus it looked ugly when doing CL searches in borderless mode. Refs #11851.
Subject: adium 1996:37c1a7da3110: Contact List Filter Bar: No longer looks busted for bubble styles. Fixes #11851.
details: http://hg.adiumx.com/adium/rev/37c1a7da3110
revision: 1996:37c1a7da3110
author: Colin Barrett <colin at springsandstruts.com>
date: Sun Apr 26 23:38:56 2009 -0700
Contact List Filter Bar: No longer looks busted for bubble styles. Fixes #11851.
Note that this fixes #11851 but resizing still looks really ugly. The scrollbar appears and the window doesn't seem to resize in the "right" direction relative to where it's docked, although it gets to the right spot eventually. It's a separate issue unrelated to this patch though.
Subject: adium 1997:10684698219d: Merge.
details: http://hg.adiumx.com/adium/rev/10684698219d
revision: 1997:10684698219d
author: Colin Barrett <colin at springsandstruts.com>
date: Sun Apr 26 23:40:26 2009 -0700
Merge.
diffstat:
Adium.xcodeproj/project.pbxproj | 3 -
ChangeLogs/Changes.txt | 1 +
Doxyfile | 4 +-
Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l | 4 +-
Frameworks/FriBidi Framework/ConvertUTF.c | 4 +-
Frameworks/FriBidi Framework/ConvertUTF.h | 4 +-
Frameworks/libpurple.framework/Versions/0.6.0/libpurple |
Plugins/Dual Window Interface/AIMessageWindowController.m | 7 +-
Release/Makefile | 12 +-
Release/upload-nightly.sh | 6 +-
Resources/ContactListWindowBorderless.nib/classes.nib | 83 +-
Resources/ContactListWindowBorderless.nib/info.nib | 2 +-
Resources/ContactListWindowBorderless.nib/keyedobjects.nib |
Source/AIListWindowController.m | 24 +-
Source/ESFileTransferRequestPromptController.m | 3 +
Source/NEHGrowlPlugin.m | 8 -
Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.h | 21 -
Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.m | 125 -
Utilities/AdiumIBPalette/AdiumIBPalette.h | 17 -
Utilities/AdiumIBPalette/AdiumIBPalette.ibclassdescription | 14 -
Utilities/AdiumIBPalette/AdiumIBPalette.m | 20 -
Utilities/AdiumIBPalette/AdiumIBPalette.tiff |
Utilities/AdiumIBPalette/AdiumIBPalette.xcodeproj/project.pbxproj | 391 -
Utilities/AdiumIBPalette/AdiumIBPalette_Prefix.pch | 8 -
Utilities/AdiumIBPalette/English.lproj/AITextColorPreviewViewInspector.nib/classes.nib | 11 -
Utilities/AdiumIBPalette/English.lproj/AITextColorPreviewViewInspector.nib/info.nib | 20 -
Utilities/AdiumIBPalette/English.lproj/AITextColorPreviewViewInspector.nib/keyedobjects.nib | 2363 ---------
Utilities/AdiumIBPalette/English.lproj/AdiumIBPalette.nib/classes.nib | 13 -
Utilities/AdiumIBPalette/English.lproj/AdiumIBPalette.nib/data.dependency | 10 -
Utilities/AdiumIBPalette/English.lproj/AdiumIBPalette.nib/info.nib | 20 -
Utilities/AdiumIBPalette/English.lproj/AdiumIBPalette.nib/keyedobjects.nib | 647 --
Utilities/AdiumIBPalette/English.lproj/InfoPlist.strings |
Utilities/AdiumIBPalette/Info.plist | 26 -
Utilities/AdiumIBPalette/palette.table | 34 -
Utilities/FindMacroMisuses.py | 2 +-
Utilities/dep-build-scripts/common.sh | 4 +-
Utilities/dep-build-scripts/purple_dependencies_make.sh | 2 +-
Utilities/svkRevNum.pl | 57 -
test.txt | 12 +
39 files changed, 140 insertions(+), 3842 deletions(-)
diffs (truncated from 4358 to 1000 lines):
diff -r 7c54b52a482a -r 10684698219d Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Fri Apr 24 13:48:27 2009 -0700
+++ b/Adium.xcodeproj/project.pbxproj Sun Apr 26 23:40:26 2009 -0700
@@ -12625,7 +12625,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
SDKROOT = macosx10.5;
STRIP_INSTALLED_PRODUCT = NO;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
@@ -12670,7 +12669,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.5;
PLIST_FILE_OUTPUT_FORMAT = binary;
PREBINDING = NO;
- PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
SDKROOT = macosx10.5;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
WARNING_CFLAGS = "-Wall";
@@ -12717,7 +12715,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.5;
PLIST_FILE_OUTPUT_FORMAT = binary;
PREBINDING = NO;
- PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
SDKROOT = macosx10.5;
STRIP_INSTALLED_PRODUCT = NO;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
diff -r 7c54b52a482a -r 10684698219d ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Fri Apr 24 13:48:27 2009 -0700
+++ b/ChangeLogs/Changes.txt Sun Apr 26 23:40:26 2009 -0700
@@ -100,6 +100,7 @@
* Nudge and buzz messages now appear as events in the window instead of messages from the contact.
* Added an option to only count mentions for group chats when badging the dock or status menu item. (#11850)
* Fixed clicking service links with message text when the link appears in the window it would open.
+ * When a new file transfer arrives which requires confirmation, the chat's unviewed content count is increased.
Accounts
* Fixed setting a global user icon. Previously, if you didn't have an account icon set but did set a global one, you would have no icon.
diff -r 7c54b52a482a -r 10684698219d Doxyfile
--- a/Doxyfile Fri Apr 24 13:48:27 2009 -0700
+++ b/Doxyfile Sun Apr 26 23:40:26 2009 -0700
@@ -150,8 +150,8 @@
*/OTR.framework/* \
*/Other/* \
*/Release/* \
- */.svn \
- */.svn/* \
+ */.hg \
+ */.hg/* \
*/*.nib/* \
*/UnitTests/* \
*/Utilities/* \
diff -r 7c54b52a482a -r 10684698219d Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l
--- a/Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l Fri Apr 24 13:48:27 2009 -0700
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l Sun Apr 26 23:40:26 2009 -0700
@@ -125,6 +125,8 @@
svn(\+ssh)?:\/\/ |
notes:\/\/ |
gopher:\/\/ |
+git:\/\/ |
+vnc:\/\/ |
x-man-page:\/\/ {yyextra = yyleng; BEGIN CANONICAL;}
mailto:{mailSpec} {return AH_MAILTO_VALID;}
@@ -141,7 +143,7 @@
{yahooIMSpec} |
{rdarSpec} |
{msnSpec} |
-{dictSpec} |
+{dictSpec} |
{spotifySpec} {return AH_URL_VALID;}
. {return AH_URL_INVALID;}
diff -r 7c54b52a482a -r 10684698219d Frameworks/FriBidi Framework/ConvertUTF.c
--- a/Frameworks/FriBidi Framework/ConvertUTF.c Fri Apr 24 13:48:27 2009 -0700
+++ b/Frameworks/FriBidi Framework/ConvertUTF.c Sun Apr 26 23:40:26 2009 -0700
@@ -292,7 +292,7 @@
* definition of UTF-8 goes up to 4-byte sequences.
*/
-static Boolean isLegalUTF8(const UTF8 *source, int length) {
+static fribidi_Boolean isLegalUTF8(const UTF8 *source, int length) {
UTF8 a;
const UTF8 *srcptr = source+length;
switch (length) {
@@ -323,7 +323,7 @@
* Exported function to return whether a UTF-8 sequence is legal or not.
* This is not used here; it's just exported.
*/
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
+fribidi_Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
int length = trailingBytesForUTF8[*source]+1;
if (source+length > sourceEnd) {
return false;
diff -r 7c54b52a482a -r 10684698219d Frameworks/FriBidi Framework/ConvertUTF.h
--- a/Frameworks/FriBidi Framework/ConvertUTF.h Fri Apr 24 13:48:27 2009 -0700
+++ b/Frameworks/FriBidi Framework/ConvertUTF.h Sun Apr 26 23:40:26 2009 -0700
@@ -98,7 +98,7 @@
typedef fribidi_uint32 UTF32; /* at least 32 bits */
typedef fribidi_uint16 UTF16; /* at least 16 bits */
typedef fribidi_uint8 UTF8; /* typically 8 bits */
-typedef unsigned char Boolean; /* 0 or 1 */
+typedef unsigned char fribidi_Boolean;
/* Some fundamental constants */
#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
@@ -148,7 +148,7 @@
const UTF32** sourceStart, const UTF32* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
-Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
+fribidi_Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
#ifdef __cplusplus
}
diff -r 7c54b52a482a -r 10684698219d Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed
diff -r 7c54b52a482a -r 10684698219d Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Fri Apr 24 13:48:27 2009 -0700
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sun Apr 26 23:40:26 2009 -0700
@@ -330,7 +330,7 @@
switch (orientation) {
case PSMTabBarHorizontalOrientation:
{
- tabBarFrame.size.height = [tabView_tabBar isTabBarHidden] ? 1 : 22;
+ tabBarFrame.size.height = [tabView_tabBar isTabBarHidden] ? 1 : kPSMTabBarControlHeight;
tabBarFrame.size.width = contentRect.size.width + 1;
//set the position of the tab bar (top/bottom)
@@ -342,9 +342,12 @@
[tabView_tabBar setAutoresizingMask:(NSViewMaxYMargin | NSViewWidthSizable)];
} else {
+ // This arbitrary sizedown is so that top tabs look visually connected to their content below.
+ tabBarFrame.size.height -= 3;
+
tabBarFrame.origin.y = NSMaxY(contentRect) - NSHeight(tabBarFrame);
tabViewMessagesFrame.origin.y = NSMinY(contentRect);
- tabViewMessagesFrame.size.height = NSHeight(contentRect) - NSHeight(tabBarFrame) + 2;
+ tabViewMessagesFrame.size.height = NSHeight(contentRect) - NSHeight(tabBarFrame);
[tabView_tabBar setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
}
/* If the cell is less than 60, icon + title + unread message count may overlap */
diff -r 7c54b52a482a -r 10684698219d Release/Makefile
--- a/Release/Makefile Fri Apr 24 13:48:27 2009 -0700
+++ b/Release/Makefile Sun Apr 26 23:40:26 2009 -0700
@@ -192,14 +192,14 @@
#This is what nightly builds use. Does not update because buildbot does.
nightly: version clean compile createfolder prepare-release-bundle tarballapp
- echo $(RELEASE_NAME) > $(BUILD_DIR)/latest
- echo $(REVISION) >> $(BUILD_DIR)/latest
- md5 -q $(BUILD_DIR)/$(RELEASE_NAME).tgz >> $(BUILD_DIR)/latest
+ echo $(RELEASE_NAME) > $(BUILD_DIR)/latest.info
+ echo $(REVISION) >> $(BUILD_DIR)/latest.info
+ md5 -q $(BUILD_DIR)/$(RELEASE_NAME).tgz >> $(BUILD_DIR)/latest.info
md5 -q $(BUILD_DIR)/$(RELEASE_NAME).tgz >> $(BUILD_DIR)/$(RELEASE_NAME).tgz.md5
- ls -l $(BUILD_DIR)/$(RELEASE_NAME).tgz | awk '{print $$5}' >>$(BUILD_DIR)/latest
- echo $(VERSION) >> $(BUILD_DIR)/latest
+ ls -l $(BUILD_DIR)/$(RELEASE_NAME).tgz | awk '{print $$5}' >>$(BUILD_DIR)/latest.info
+ echo $(VERSION) >> $(BUILD_DIR)/latest.info
ifeq ($(OFFICIAL_BUILD),TRUE)
- ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME).tgz ~/adium-dsa-sign/dsa_priv.pem >> $(BUILD_DIR)/latest
+ ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME).tgz ~/adium-dsa-sign/dsa_priv.pem >> $(BUILD_DIR)/latest.info
endif
tarballapp:
diff -r 7c54b52a482a -r 10684698219d Release/upload-nightly.sh
--- a/Release/upload-nightly.sh Fri Apr 24 13:48:27 2009 -0700
+++ b/Release/upload-nightly.sh Sun Apr 26 23:40:26 2009 -0700
@@ -8,7 +8,7 @@
PARENT=$(dirname $0)
cd ${PARENT:-.}
-ADIUM_RELEASE_NAME=`head -n 1 build/latest | tail -n 1`
-scp build/latest build/${ADIUM_RELEASE_NAME}.tgz.md5 build/${ADIUM_RELEASE_NAME}.tgz ${NIGHTLY_USER}@${NIGHTLY_HOST}:
-ssh ${NIGHTLY_USER}@${NIGHTLY_HOST} chmod go+r ${ADIUM_RELEASE_NAME}.tgz latest ${ADIUM_RELEASE_NAME}.tgz.md5
+ADIUM_RELEASE_NAME=`head -n 1 build/latest.info | tail -n 1`
+scp build/latest.info build/${ADIUM_RELEASE_NAME}.tgz.md5 build/${ADIUM_RELEASE_NAME}.tgz ${NIGHTLY_USER}@${NIGHTLY_HOST}:
+ssh ${NIGHTLY_USER}@${NIGHTLY_HOST} chmod go+r ${ADIUM_RELEASE_NAME}.tgz latest.info ${ADIUM_RELEASE_NAME}.tgz.md5
diff -r 7c54b52a482a -r 10684698219d Resources/ContactListWindowBorderless.nib/classes.nib
--- a/Resources/ContactListWindowBorderless.nib/classes.nib Fri Apr 24 13:48:27 2009 -0700
+++ b/Resources/ContactListWindowBorderless.nib/classes.nib Sun Apr 26 23:40:26 2009 -0700
@@ -6,6 +6,22 @@
<array>
<dict>
<key>CLASS</key>
+ <string>AIAlternatingRowOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>AIOutlineView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSApplication</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>RBSplitView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -35,6 +51,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -90,6 +114,14 @@
<string>AIAnimatingListOutlineView</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>NSScrollView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>close</key>
@@ -125,6 +157,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>AIFilterBarView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>AIBorderlessListWindowController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -133,11 +173,11 @@
</dict>
<dict>
<key>CLASS</key>
- <string>AIFilterBarView</string>
+ <string>NSView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>NSView</string>
+ <string>NSResponder</string>
</dict>
<dict>
<key>CLASS</key>
@@ -145,7 +185,7 @@
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
- <string>AIOutlineView</string>
+ <string>AIVariableHeightOutlineView</string>
</dict>
<dict>
<key>CLASS</key>
@@ -165,6 +205,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSButton</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -173,6 +221,14 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>NSOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSTableView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>AIBorderlessWindow</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -189,6 +245,19 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>AIVariableHeightOutlineView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>AIAlternatingRowOutlineView</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>performFindPanelAction</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
<string>AIOutlineView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -229,6 +298,14 @@
<key>SUPERCLASS</key>
<string>NSScrollView</string>
</dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSTableView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
</array>
<key>IBVersion</key>
<string>1</string>
diff -r 7c54b52a482a -r 10684698219d Resources/ContactListWindowBorderless.nib/info.nib
--- a/Resources/ContactListWindowBorderless.nib/info.nib Fri Apr 24 13:48:27 2009 -0700
+++ b/Resources/ContactListWindowBorderless.nib/info.nib Sun Apr 26 23:40:26 2009 -0700
@@ -10,7 +10,7 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>198</integer>
+ <integer>208</integer>
</array>
<key>IBSystem Version</key>
<string>9G55</string>
diff -r 7c54b52a482a -r 10684698219d Resources/ContactListWindowBorderless.nib/keyedobjects.nib
Binary file Resources/ContactListWindowBorderless.nib/keyedobjects.nib has changed
diff -r 7c54b52a482a -r 10684698219d Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Fri Apr 24 13:48:27 2009 -0700
+++ b/Source/AIListWindowController.m Sun Apr 26 23:40:26 2009 -0700
@@ -1543,22 +1543,30 @@
targetFrame.size.height = NSHeight(targetFrame) - NSHeight([filterBarView bounds]);
}
+
+ // Filter bar resizing
+ // Create a new variable here, because we want the bar's view to be based, visually, on the location of the contact list, not its enclosing super view.
+ NSRect barTargetFrame = contactListView.frame;
+ if (filterBarIsVisible) {
+ barTargetFrame.size.height = NSHeight(barTargetFrame) + NSHeight(filterBarView.bounds);
+ } else {
+ barTargetFrame.size.height = NSHeight(barTargetFrame) - NSHeight(filterBarView.bounds);
+ }
- // Filter bar resizing
if (!filterBarIsVisible) {
- // If the filter bar isn't already visible
- [filterBarView setFrame:NSMakeRect(NSMinX(targetFrame),
- NSHeight([targetView frame]),
- NSWidth(targetFrame),
+ // If the filter bar isn't already visible
+ [filterBarView setFrame:NSMakeRect(NSMinX(barTargetFrame),
+ NSHeight([contactListView frame]),
+ NSWidth(barTargetFrame),
NSHeight([filterBarView bounds]))];
-
+
// Attach the filter bar to the window
[[[self window] contentView] addSubview:filterBarView];
}
filterBarDict = [NSDictionary dictionaryWithObjectsAndKeys:filterBarView, NSViewAnimationTargetKey,
- [NSValue valueWithRect:NSMakeRect(NSMinX(targetFrame), NSHeight(targetFrame),
- NSWidth(targetFrame), NSHeight([filterBarView bounds]))], NSViewAnimationEndFrameKey, nil];
+ [NSValue valueWithRect:NSMakeRect(NSMinX(barTargetFrame), NSHeight(barTargetFrame),
+ NSWidth(barTargetFrame), NSHeight([filterBarView bounds]))], NSViewAnimationEndFrameKey, nil];
targetViewDict = [NSDictionary dictionaryWithObjectsAndKeys:targetView, NSViewAnimationTargetKey,
[NSValue valueWithRect:targetFrame], NSViewAnimationEndFrameKey, nil];
diff -r 7c54b52a482a -r 10684698219d Source/ESFileTransferRequestPromptController.m
--- a/Source/ESFileTransferRequestPromptController.m Fri Apr 24 13:48:27 2009 -0700
+++ b/Source/ESFileTransferRequestPromptController.m Sun Apr 26 23:40:26 2009 -0700
@@ -60,6 +60,9 @@
[fileTransfer setFileTransferRequestPromptController:self];
AILog(@"%@: Requeseting file transfer %@", self, fileTransfer);
[adium.contentController receiveContentObject:fileTransfer];
+
+ // We don't want it to be a normal event, but we DO want to increment the unviewed content count.
+ [fileTransfer.chat incrementUnviewedContentCount];
}
return self;
diff -r 7c54b52a482a -r 10684698219d Source/NEHGrowlPlugin.m
--- a/Source/NEHGrowlPlugin.m Fri Apr 24 13:48:27 2009 -0700
+++ b/Source/NEHGrowlPlugin.m Sun Apr 26 23:40:26 2009 -0700
@@ -81,14 +81,6 @@
}
/*!
- * @brief Deallocate
- */
-- (void)dealloc
-{
- [super dealloc];
-}
-
-/*!
* @brief Adium finished launching
*
* Delays one more run loop so any events which are registered on this notification are guaranteed to be complete
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.h
--- a/Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.h Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-//
-// AITextColorPreviewViewInspector.h
-// AdiumIBPalette
-//
-// Created by Peter Hosey on 2006-05-11.
-// Copyright 2006 The Adium Project. All rights reserved.
-//
-
-#import <InterfaceBuilder/InterfaceBuilder.h>
-
-#import "AITextColorPreviewView.h"
-
- at interface AITextColorPreviewViewInspector : IBInspector
-{
-}
-- (void) setPreviewText:(NSString *)newPreviewText;
- at end
-
- at interface AITextColorPreviewView (AdiumIBPaletteInspector)
-- (NSString *)inspectorClassName;
- at end
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.m
--- a/Utilities/AdiumIBPalette/AITextColorPreviewViewInspector.m Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-//
-// AITextColorPreviewViewInspector.m
-// AdiumIBPalette
-//
-// Created by Peter Hosey on 2006-05-11.
-// Copyright 2006 The Adium Project. All rights reserved.
-//
-
-#import "AITextColorPreviewViewInspector.h"
-
- at implementation AITextColorPreviewViewInspector
-
-- (id) init
-{
- if((self = [super init])) {
- [NSBundle loadNibNamed:@"AITextColorPreviewViewInspector" owner:self];
- }
- return self;
-}
-
-/* We're supposed to override this, but with Bindings, we don't need to.
- Bindings in IB inspectors are kind of flaky, though, so I'm leaving this here for now, in case we need to use it.
- -- boredzo
-
-- (void)ok:(id)sender
-{
- [super ok:sender];
-}
-*/
-
-- (void)revert:(id)sender
-{
- [self willChangeValueForKey:@"previewText"];
- [self didChangeValueForKey:@"previewText"];
- [self willChangeValueForKey:@"textColor"];
- [self didChangeValueForKey:@"textColor"];
- [self willChangeValueForKey:@"textShadowColor"];
- [self didChangeValueForKey:@"textShadowColor"];
- [self willChangeValueForKey:@"backgroundColor"];
- [self didChangeValueForKey:@"backgroundColor"];
- [self willChangeValueForKey:@"backgroundGradientColor"];
- [self didChangeValueForKey:@"backgroundGradientColor"];
- [self willChangeValueForKey:@"textShadowEnabled"];
- [self didChangeValueForKey:@"textShadowEnabled"];
- [self willChangeValueForKey:@"backgroundEnabled"];
- [self didChangeValueForKey:@"backgroundEnabled"];
-
- [super revert:sender];
-}
-
-#pragma Bindings accessors
-
-//All of these forward data to/from the preview view.
-
-- (NSString *) previewText {
- return [[self object] previewText];
-}
-- (void) setPreviewText:(NSString *)newPreviewText {
- [[self object] setPreviewText:newPreviewText];
-
- //Bug in IB's Bindings support (if it has any): We can't call -ok: from here because this is a text field.
- //Instead, we call it after a delay.
-// [super ok:nil];
- [self performSelector:@selector(ok:)
- withObject:nil
- afterDelay:0.1];
-}
-
-- (NSColor *) textColor {
- return [[self object] textColor];
-}
-- (void) setTextColor:(NSColor *)newTextColor {
- [[self object] setTextColor:newTextColor];
- [super ok:nil];
-}
-
-- (NSColor *) textShadowColor {
- return [[self object] textShadowColor];
-}
-- (void) setTextShadowColor:(NSColor *)newTextShadowColor {
- [[self object] setTextShadowColor:newTextShadowColor];
- [super ok:nil];
-}
-
-- (NSColor *) backgroundColor {
- return [[self object] backgroundColor];
-}
-- (void) setBackgroundColor:(NSColor *)newBackgroundColor {
- [[self object] setBackgroundColor:newBackgroundColor];
- [super ok:nil];
-}
-
-- (NSColor *) backgroundGradientColor {
- return [[self object] backgroundGradientColor];
-}
-- (void) setBackgroundGradientColor:(NSColor *)newBackgroundGradientColor {
- [[self object] setBackgroundGradientColor:newBackgroundGradientColor];
- [super ok:nil];
-}
-
-- (BOOL) textShadowEnabled {
- return [[self object] textShadowEnabled];
-}
-- (void) setTextShadowEnabled:(BOOL)flag {
- [[self object] setTextShadowEnabled:flag];
- [super ok:nil];
-}
-
-- (BOOL) backgroundEnabled {
- return [[self object] backgroundEnabled];
-}
-- (void) setBackgroundEnabled:(BOOL)flag {
- [[self object] setBackgroundEnabled:flag];
- [super ok:nil];
-}
-
- at end
-
- at implementation AITextColorPreviewView (AdiumIBPaletteInspector)
-
-- (NSString *)inspectorClassName {
- return @"AITextColorPreviewViewInspector";
-}
-
- at end
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AdiumIBPalette.h
--- a/Utilities/AdiumIBPalette/AdiumIBPalette.h Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-//
-// AdiumIBPalette.h
-// AdiumIBPalette
-//
-// Created by Peter Hosey on 2006-05-11.
-// Copyright 2006 The Adium Project. All rights reserved.
-//
-
-#import <InterfaceBuilder/InterfaceBuilder.h>
-
-#import "AITextColorPreviewView.h"
-
- at interface AdiumIBPalette : IBPalette
-{
- IBOutlet AITextColorPreviewView *previewView;
-}
- at end
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AdiumIBPalette.ibclassdescription
--- a/Utilities/AdiumIBPalette/AdiumIBPalette.ibclassdescription Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-{
- AITextColorPreviewView = {
- SuperClass = NSView;
- Attributes = {
- previewText = {};
- textColor = {};
- textShadowEnabled = {};
- textShadowColor = {};
- backgroundEnabled = {};
- backgroundColor = {};
- backgroundGradientColor = {};
- };
- };
-}
\ No newline at end of file
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AdiumIBPalette.m
--- a/Utilities/AdiumIBPalette/AdiumIBPalette.m Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-//
-// AdiumIBPalette.m
-// AdiumIBPalette
-//
-// Created by Peter Hosey on 2006-05-11.
-// Copyright 2006 The Adium Project. All rights reserved.
-//
-
-#import "AdiumIBPalette.h"
-
- at implementation AdiumIBPalette
-
-- (void)finishInstantiate
-{
- [previewView setPreviewText:NSLocalizedString(@"Text color preview", /*comment*/ nil)];
-
- [super finishInstantiate];
-}
-
- at end
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AdiumIBPalette.tiff
Binary file Utilities/AdiumIBPalette/AdiumIBPalette.tiff has changed
diff -r 7c54b52a482a -r 10684698219d Utilities/AdiumIBPalette/AdiumIBPalette.xcodeproj/project.pbxproj
--- a/Utilities/AdiumIBPalette/AdiumIBPalette.xcodeproj/project.pbxproj Fri Apr 24 13:48:27 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 0711CA160A147ED20046A860 /* AIUtilities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0711CA150A147ED20046A860 /* AIUtilities.framework */; };
- 0711CA1B0A147EDC0046A860 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0711CA1A0A147EDC0046A860 /* Adium.framework */; };
- 073481060A28062100F50878 /* AdiumIBPalette.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 073481050A28062100F50878 /* AdiumIBPalette.tiff */; };
- 0762FD020A27F616005CE437 /* AITextColorPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 07F37AEB0A13CEF70072C392 /* AITextColorPreviewView.m */; };
- 13EB9DBE07DE0F1E00EB933A /* InterfaceBuilder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */; };
- 54D33B2906778E3300C9C163 /* AdiumIBPalette.ibclassdescription in Resources */ = {isa = PBXBuildFile; fileRef = 54D33B2806778E3300C9C163 /* AdiumIBPalette.ibclassdescription */; };
- 8D1AC9670486D14A00FE50C9 /* AITextColorPreviewViewInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 0259C57EFE90428111CA0C5A /* AITextColorPreviewViewInspector.nib */; };
- 8D1AC9680486D14A00FE50C9 /* AdiumIBPalette.nib in Resources */ = {isa = PBXBuildFile; fileRef = 0259C580FE90428111CA0C5A /* AdiumIBPalette.nib */; };
- 8D1AC9690486D14A00FE50C9 /* palette.table in Resources */ = {isa = PBXBuildFile; fileRef = 0259C583FE90428111CA0C5A /* palette.table */; };
- 8D1AC96C0486D14A00FE50C9 /* AITextColorPreviewViewInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = 0259C577FE90428111CA0C5A /* AITextColorPreviewViewInspector.m */; settings = {ATTRIBUTES = (); }; };
- 8D1AC96D0486D14A00FE50C9 /* AdiumIBPalette.m in Sources */ = {isa = PBXBuildFile; fileRef = 0259C578FE90428111CA0C5A /* AdiumIBPalette.m */; settings = {ATTRIBUTES = (); }; };
- 8D1AC9700486D14A00FE50C9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD92D38A0106425D02CA0E72 /* Cocoa.framework */; };
- 8D1AC9800486D23B00FE50C9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
- 0259C577FE90428111CA0C5A /* AITextColorPreviewViewInspector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AITextColorPreviewViewInspector.m; sourceTree = "<group>"; };
- 0259C578FE90428111CA0C5A /* AdiumIBPalette.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AdiumIBPalette.m; sourceTree = "<group>"; };
- 0259C57BFE90428111CA0C5A /* AITextColorPreviewViewInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AITextColorPreviewViewInspector.h; sourceTree = "<group>"; };
- 0259C57CFE90428111CA0C5A /* AdiumIBPalette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AdiumIBPalette.h; sourceTree = "<group>"; };
- 0259C57FFE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AITextColorPreviewViewInspector.nib; sourceTree = "<group>"; };
- 0259C581FE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AdiumIBPalette.nib; sourceTree = "<group>"; };
- 0259C583FE90428111CA0C5A /* palette.table */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = palette.table; sourceTree = "<group>"; };
- 0711CA150A147ED20046A860 /* AIUtilities.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AIUtilities.framework; path = "../../Frameworks/AIUtilities Framework/build/Release/AIUtilities.framework"; sourceTree = SOURCE_ROOT; };
- 0711CA1A0A147EDC0046A860 /* Adium.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Adium.framework; path = ../../build/Release/Adium.framework; sourceTree = SOURCE_ROOT; };
- 073481050A28062100F50878 /* AdiumIBPalette.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AdiumIBPalette.tiff; sourceTree = "<group>"; };
- 07F37AEA0A13CEF70072C392 /* AITextColorPreviewView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITextColorPreviewView.h; path = "../../Plugins/Contact List/Preferences/AITextColorPreviewView.h"; sourceTree = SOURCE_ROOT; };
- 07F37AEB0A13CEF70072C392 /* AITextColorPreviewView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITextColorPreviewView.m; path = "../../Plugins/Contact List/Preferences/AITextColorPreviewView.m"; sourceTree = SOURCE_ROOT; };
- 13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InterfaceBuilder.framework; path = /System/Library/Frameworks/InterfaceBuilder.framework; sourceTree = "<absolute>"; };
- 13F8B88807B434F6008AE28D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
- 13F8B88907B434F6008AE28D /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
- 13F8B88A07B434F6008AE28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
- 32DBCF980370C29C00C91783 /* AdiumIBPalette_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdiumIBPalette_Prefix.pch; sourceTree = "<group>"; };
- 54D33B2806778E3300C9C163 /* AdiumIBPalette.ibclassdescription */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AdiumIBPalette.ibclassdescription; sourceTree = "<group>"; };
- 8D1AC9730486D14A00FE50C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
- 8D1AC9740486D14A00FE50C9 /* AdiumIBPalette.palette */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AdiumIBPalette.palette; sourceTree = BUILT_PRODUCTS_DIR; };
- 8D1AC97B0486D23100FE50C9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
- DD92D38A0106425D02CA0E72 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 8D1AC96E0486D14A00FE50C9 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D1AC9700486D14A00FE50C9 /* Cocoa.framework in Frameworks */,
- 13EB9DBE07DE0F1E00EB933A /* InterfaceBuilder.framework in Frameworks */,
- 0711CA160A147ED20046A860 /* AIUtilities.framework in Frameworks */,
- 0711CA1B0A147EDC0046A860 /* Adium.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 0259C574FE90428111CA0C5A /* AdiumIBPalette */ = {
- isa = PBXGroup;
- children = (
- 07F37AF00A13CEFE0072C392 /* Represented classes */,
- 32DBCF9E0370C38000C91783 /* Palette */,
- 0259C582FE90428111CA0C5A /* Resources */,
- 1ED78706FE9D4A0611CA0C5A /* Products */,
- 2E58F364FFB232C311CA0CBA /* Frameworks */,
- );
- name = AdiumIBPalette;
- sourceTree = "<group>";
- };
- 0259C582FE90428111CA0C5A /* Resources */ = {
- isa = PBXGroup;
- children = (
- 8D1AC9730486D14A00FE50C9 /* Info.plist */,
- 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */,
- );
- name = Resources;
- sourceTree = "<group>";
- };
- 07F37AF00A13CEFE0072C392 /* Represented classes */ = {
- isa = PBXGroup;
- children = (
- 07F37AF40A13CF140072C392 /* From AIUtilities.framework */,
- 07F37AF70A13CF140072C392 /* From Adium.framework */,
- 07F37AF10A13CF070072C392 /* From Adium */,
- );
- name = "Represented classes";
- sourceTree = "<group>";
- };
- 07F37AF10A13CF070072C392 /* From Adium */ = {
- isa = PBXGroup;
- children = (
- 07F37AEA0A13CEF70072C392 /* AITextColorPreviewView.h */,
- 07F37AEB0A13CEF70072C392 /* AITextColorPreviewView.m */,
- );
- name = "From Adium";
- sourceTree = "<group>";
- };
- 07F37AF40A13CF140072C392 /* From AIUtilities.framework */ = {
- isa = PBXGroup;
- children = (
- );
- name = "From AIUtilities.framework";
- sourceTree = "<group>";
- };
- 07F37AF70A13CF140072C392 /* From Adium.framework */ = {
- isa = PBXGroup;
- children = (
- );
- name = "From Adium.framework";
- sourceTree = "<group>";
- };
- 131E8FE8067F80F40006E0CE /* Resources */ = {
- isa = PBXGroup;
- children = (
- 0259C57EFE90428111CA0C5A /* AITextColorPreviewViewInspector.nib */,
- 0259C580FE90428111CA0C5A /* AdiumIBPalette.nib */,
- 073481050A28062100F50878 /* AdiumIBPalette.tiff */,
- );
- name = Resources;
- sourceTree = "<group>";
- };
- 13F8B6FD07B43410008AE28D /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */,
- DD92D38A0106425D02CA0E72 /* Cocoa.framework */,
- 0711CA150A147ED20046A860 /* AIUtilities.framework */,
- 0711CA1A0A147EDC0046A860 /* Adium.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "<group>";
- };
- 13F8B70407B43425008AE28D /* Other Frameworks */ = {
- isa = PBXGroup;
- children = (
- 13F8B88807B434F6008AE28D /* AppKit.framework */,
- 13F8B88907B434F6008AE28D /* CoreData.framework */,
- 13F8B88A07B434F6008AE28D /* Foundation.framework */,
- );
- name = "Other Frameworks";
- sourceTree = "<group>";
- };
- 1ED78706FE9D4A0611CA0C5A /* Products */ = {
- isa = PBXGroup;
- children = (
- 8D1AC9740486D14A00FE50C9 /* AdiumIBPalette.palette */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 2E58F364FFB232C311CA0CBA /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 13F8B6FD07B43410008AE28D /* Linked Frameworks */,
- 13F8B70407B43425008AE28D /* Other Frameworks */,
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
- 32DBCF9E0370C38000C91783 /* Palette */ = {
- isa = PBXGroup;
- children = (
- 54D33B2406778DD400C9C163 /* Undo Support */,
- 54D33B2506778DF000C9C163 /* Classes */,
- 32DBCF9F0370C38200C91783 /* Other Sources */,
- 131E8FE8067F80F40006E0CE /* Resources */,
- 0259C583FE90428111CA0C5A /* palette.table */,
- );
- name = Palette;
- sourceTree = "<group>";
- };
- 32DBCF9F0370C38200C91783 /* Other Sources */ = {
- isa = PBXGroup;
- children = (
- 32DBCF980370C29C00C91783 /* AdiumIBPalette_Prefix.pch */,
- );
- name = "Other Sources";
- sourceTree = "<group>";
- };
- 54D33B2406778DD400C9C163 /* Undo Support */ = {
- isa = PBXGroup;
- children = (
- 54D33B2806778E3300C9C163 /* AdiumIBPalette.ibclassdescription */,
- );
- name = "Undo Support";
- sourceTree = "<group>";
- };
- 54D33B2506778DF000C9C163 /* Classes */ = {
- isa = PBXGroup;
- children = (
- 0259C57BFE90428111CA0C5A /* AITextColorPreviewViewInspector.h */,
- 0259C577FE90428111CA0C5A /* AITextColorPreviewViewInspector.m */,
- 0259C57CFE90428111CA0C5A /* AdiumIBPalette.h */,
- 0259C578FE90428111CA0C5A /* AdiumIBPalette.m */,
- );
- name = Classes;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 8D1AC9600486D14A00FE50C9 /* AdiumIBPalette */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = C056398308A954F8003078D8 /* Build configuration list for PBXNativeTarget "AdiumIBPalette" */;
- buildPhases = (
- 8D1AC9660486D14A00FE50C9 /* Resources */,
- 8D1AC96A0486D14A00FE50C9 /* Sources */,
- 8D1AC96E0486D14A00FE50C9 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = AdiumIBPalette;
- productInstallPath = "$(HOME)/Developer/Palettes";
- productName = AdiumIBPalette;
- productReference = 8D1AC9740486D14A00FE50C9 /* AdiumIBPalette.palette */;
- productType = "com.apple.product-type.bundle";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 0259C573FE90428111CA0C5A /* Project object */ = {
- isa = PBXProject;
- buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "AdiumIBPalette" */;
- hasScannedForEncodings = 1;
- mainGroup = 0259C574FE90428111CA0C5A /* AdiumIBPalette */;
- projectDirPath = "";
- targets = (
- 8D1AC9600486D14A00FE50C9 /* AdiumIBPalette */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 8D1AC9660486D14A00FE50C9 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D1AC9670486D14A00FE50C9 /* AITextColorPreviewViewInspector.nib in Resources */,
- 8D1AC9680486D14A00FE50C9 /* AdiumIBPalette.nib in Resources */,
- 8D1AC9800486D23B00FE50C9 /* InfoPlist.strings in Resources */,
- 8D1AC9690486D14A00FE50C9 /* palette.table in Resources */,
- 54D33B2906778E3300C9C163 /* AdiumIBPalette.ibclassdescription in Resources */,
- 073481060A28062100F50878 /* AdiumIBPalette.tiff in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 8D1AC96A0486D14A00FE50C9 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 8D1AC96D0486D14A00FE50C9 /* AdiumIBPalette.m in Sources */,
- 0762FD020A27F616005CE437 /* AITextColorPreviewView.m in Sources */,
- 8D1AC96C0486D14A00FE50C9 /* AITextColorPreviewViewInspector.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
- 0259C57EFE90428111CA0C5A /* AITextColorPreviewViewInspector.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 0259C57FFE90428111CA0C5A /* English */,
- );
- name = AITextColorPreviewViewInspector.nib;
- sourceTree = "<group>";
- };
- 0259C580FE90428111CA0C5A /* AdiumIBPalette.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 0259C581FE90428111CA0C5A /* English */,
- );
- name = AdiumIBPalette.nib;
- sourceTree = "<group>";
- };
- 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 8D1AC97B0486D23100FE50C9 /* English */,
- );
- name = InfoPlist.strings;
- sourceTree = "<group>";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- C056398408A954F8003078D8 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = (
- "$(FRAMEWORK_SEARCH_PATHS)",
- "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
- );
- FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/../../Frameworks/AIUtilities\\ Framework/build/$(BUILD_STYLE) $(SRCROOT)/../../build/$(BUILD_STYLE)";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = AdiumIBPalette_Prefix.pch;
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Library/Palettes";
- PRODUCT_NAME = AdiumIBPalette;
- WRAPPER_EXTENSION = palette;
- ZERO_LINK = YES;
- };
- name = Debug;
- };
- C056398508A954F8003078D8 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- FRAMEWORK_SEARCH_PATHS = (
- "$(FRAMEWORK_SEARCH_PATHS)",
- "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
- );
- FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "$(SRCROOT)/../../Frameworks/AIUtilities\\ Framework/build/$(BUILD_STYLE) $(SRCROOT)/../../build/$(BUILD_STYLE)";
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G5;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = AdiumIBPalette_Prefix.pch;
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Library/Palettes";
- PRODUCT_NAME = AdiumIBPalette;
- WRAPPER_EXTENSION = palette;
- };
- name = Release;
- };
- C056398C08A954F8003078D8 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_C_LANGUAGE_STANDARD = c99;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
More information about the commits
mailing list