adium 3753:3de7cec9b4d4: Backed out changeset 4b8d5b913c9b
commits at adium.im
commits at adium.im
Wed Mar 16 06:02:33 UTC 2011
details: http://hg.adium.im/adium/rev/3de7cec9b4d4
revision: 3753:3de7cec9b4d4
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 22:59:57 2011 -0700
Backed out changeset 4b8d5b913c9b
Subject: adium 3754:09d5fa4f3286: Merge
details: http://hg.adium.im/adium/rev/09d5fa4f3286
revision: 3754:09d5fa4f3286
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:01:11 2011 -0700
Merge
diffs (274 lines):
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Mar 15 20:31:02 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Tue Mar 15 23:01:11 2011 -0700
@@ -12726,6 +12726,7 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Debug;
};
@@ -12737,6 +12738,7 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = Release;
};
@@ -12748,6 +12750,7 @@
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
);
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
};
name = "Release-Debug";
};
@@ -12755,6 +12758,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -12762,6 +12767,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
+ SDKROOT = macosx10.6;
};
name = Release;
};
@@ -12769,6 +12776,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
buildSettings = {
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
+ SDKROOT = macosx10.6;
};
name = "Release-Debug";
};
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Tue Mar 15 20:31:02 2011 -0500
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Tue Mar 15 23:01:11 2011 -0700
@@ -401,7 +401,11 @@
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* AIHyperlinks.framework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -616,6 +620,7 @@
MACH_O_TYPE = mh_dylib;
PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
+ SDKROOT = macosx10.6;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = framework;
@@ -867,6 +872,7 @@
MACH_O_TYPE = mh_dylib;
PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
+ SDKROOT = macosx10.6;
SKIP_INSTALL = YES;
WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = framework;
@@ -890,6 +896,7 @@
MACH_O_TYPE = mh_dylib;
PREBINDING = NO;
PRODUCT_NAME = AutoHyperlinks;
+ SDKROOT = macosx10.6;
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = YES;
WARNING_CFLAGS = "-Wall";
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Tue Mar 15 20:31:02 2011 -0500
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Tue Mar 15 23:01:11 2011 -0700
@@ -302,7 +302,11 @@
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FriBidi" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* FriBidi */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -368,6 +372,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -384,6 +389,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = Release;
@@ -449,6 +455,7 @@
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = "Release-Debug";
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj
--- a/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Tue Mar 15 20:31:02 2011 -0500
+++ b/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Tue Mar 15 23:01:11 2011 -0700
@@ -392,7 +392,11 @@
};
buildConfigurationList = D50F206F08A01A630073A261 /* Build configuration list for PBXProject "RBSplitView" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0259C574FE90428111CA0C5A /* RBSplitView */;
projectDirPath = "";
projectRoot = "";
@@ -627,6 +631,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = "Release-Debug";
@@ -635,6 +640,7 @@
isa = XCBuildConfiguration;
buildSettings = {
LIBRARY_STYLE = STATIC;
+ SDKROOT = macosx10.6;
};
name = "Release-Debug";
};
@@ -650,6 +656,7 @@
isa = XCBuildConfiguration;
buildSettings = {
LIBRARY_STYLE = STATIC;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -657,6 +664,7 @@
isa = XCBuildConfiguration;
buildSettings = {
LIBRARY_STYLE = STATIC;
+ SDKROOT = macosx10.6;
};
name = Release;
};
@@ -686,6 +694,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -698,6 +707,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Framework-Info.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = framework;
};
name = Release;
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m Tue Mar 15 20:31:02 2011 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.m Tue Mar 15 23:01:11 2011 -0700
@@ -2692,11 +2692,7 @@
char **prpl_formats = g_strsplit(prpl_info->icon_spec.format,",",0);
//Look for gif first if the image is animated
- NSImageRep *imageRep = [image bestRepresentationForRect:NSMakeRect(0, 0, image.size.width, image.size.height)
-
-
- context:nil
- hints:nil];
+ NSImageRep *imageRep = [image bestRepresentationForDevice:nil] ;
if ([imageRep isKindOfClass:[NSBitmapImageRep class]] &&
[[(NSBitmapImageRep *)imageRep valueForProperty:NSImageFrameCount] integerValue] > 1) {
@@ -3019,7 +3015,7 @@
- (NSString *)titleForAccountActionMenuLabel:(const char *)label
{
if ((strcmp(label, _("Change Password...")) == 0) || (strcmp(label, _("Change Password")) == 0)) {
- return [AILocalizedString(@"Change Password", "Menu item title for changing the password of an account") stringByAppendingEllipsis];
+ return [[NSString stringWithFormat:AILocalizedString(@"Change Password", "Menu item title for changing the password of an account")] stringByAppendingEllipsis];
} else {
return [NSString stringWithUTF8String:label];
}
diff -r 4b8d5b913c9b -r 09d5fa4f3286 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Tue Mar 15 20:31:02 2011 -0500
+++ b/Source/AIListWindowController.m Tue Mar 15 23:01:11 2011 -0700
@@ -303,16 +303,8 @@
if (allSpaces)
behavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
-
- if ([NSApp isOnSnowLeopardOrBetter]) {
- if (stationary) {
- behavior |= NSWindowCollectionBehaviorStationary;
- } else {
- behavior |= NSWindowCollectionBehaviorManaged;
- }
-
- behavior |= NSWindowCollectionBehaviorParticipatesInCycle;
- }
+ if (stationary && [NSApp isOnSnowLeopardOrBetter])
+ behavior |= NSWindowCollectionBehaviorStationary;
[window setCollectionBehavior:behavior];
}
@@ -345,7 +337,7 @@
showOnAllSpaces = [[prefDict objectForKey:KEY_CL_ALL_SPACES] boolValue];
[self setCollectionBehaviorOfWindow:[self window]
showOnAllSpaces:showOnAllSpaces
- isStationary:(windowLevel == AIDesktopWindowLevel)];
+ isStationary:YES];
if (windowHidingStyle == AIContactListWindowHidingStyleSliding) {
if (!slideWindowIfNeededTimer) {
@@ -801,9 +793,7 @@
windowHidingStyle == AIContactListWindowHidingStyleSliding) {
[self setWindowLevel:kCGBackstopMenuLevel];
- [self setCollectionBehaviorOfWindow:[self window]
- showOnAllSpaces:YES
- isStationary:YES];
+ [[self window] setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces];
overrodeWindowLevel = YES;
}
@@ -818,9 +808,8 @@
*/
[self setWindowLevel:levelForAIWindowLevel(windowLevel)];
- [self setCollectionBehaviorOfWindow:[self window]
- showOnAllSpaces:showOnAllSpaces
- isStationary:(windowLevel == AIDesktopWindowLevel)];
+ [[self window] setCollectionBehavior:showOnAllSpaces ? NSWindowCollectionBehaviorCanJoinAllSpaces : NSWindowCollectionBehaviorDefault];
+
overrodeWindowLevel = NO;
}
}
More information about the commits
mailing list