Skip to content

Commit 1a6ff75

Browse files
laullonlaullon
committed
working on OX X Lion
1 parent f0c7644 commit 1a6ff75

File tree

2 files changed

+15
-34
lines changed

2 files changed

+15
-34
lines changed

‎GitX.xcodeproj/project.pbxproj

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 45;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -63,6 +63,7 @@
6363
31460CD4124185BA00B90AED /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 31460CAF124185BA00B90AED /* ReadMe.txt */; };
6464
31460CD5124185BA00B90AED /* Source Code License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB0124185BA00B90AED /* Source Code License.rtf */; };
6565
31460CD6124185BA00B90AED /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB1124185BA00B90AED /* TODO */; };
66+
314BCAC713DAF5FA00CD85F3 /* PBGitSidebarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */; };
6667
316E7202131EE9C600AFBB36 /* list_Template.png in Resources */ = {isa = PBXBuildFile; fileRef = 316E7200131EE9C600AFBB36 /* list_Template.png */; };
6768
316E7203131EE9C600AFBB36 /* sidebar_Template.png in Resources */ = {isa = PBXBuildFile; fileRef = 316E7201131EE9C600AFBB36 /* sidebar_Template.png */; };
6869
31776089133569350025876E /* SearchWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 31776088133569350025876E /* SearchWebView.m */; };
@@ -171,7 +172,6 @@
171172
F580E6AE0E733276009E2D3F /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F580E6AD0E733276009E2D3F /* Sparkle.framework */; };
172173
F580E6B10E73328C009E2D3F /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F580E6AD0E733276009E2D3F /* Sparkle.framework */; };
173174
F58DB55910566D3500CFDF4A /* PBGitSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = F58DB55810566D3500CFDF4A /* PBGitSidebarController.m */; };
174-
F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */; };
175175
F58DB5E8105671B600CFDF4A /* PBSourceViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = F58DB5E7105671B600CFDF4A /* PBSourceViewItem.m */; };
176176
F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */; };
177177
F59116E90E843BCB0072CCB1 /* PBGitCommitController.m in Sources */ = {isa = PBXBuildFile; fileRef = F59116E80E843BCB0072CCB1 /* PBGitCommitController.m */; };
@@ -1220,8 +1220,12 @@
12201220
/* Begin PBXProject section */
12211221
29B97313FDCFA39411CA2CEA /* Project object */ = {
12221222
isa = PBXProject;
1223-
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
1224-
compatibilityVersion = "Xcode 3.1";
1223+
attributes = {
1224+
LastUpgradeCheck = 0420;
1225+
};
1226+
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "gitx" */;
1227+
compatibilityVersion = "Xcode 3.2";
1228+
developmentRegion = English;
12251229
hasScannedForEncodings = 1;
12261230
knownRegions = (
12271231
English,
@@ -1266,14 +1270,13 @@
12661270
47DBDB6A0E94EF6500671A1E /* Preferences.xib in Resources */,
12671271
47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */,
12681272
F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */,
1269-
F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */,
1273+
314BCAC713DAF5FA00CD85F3 /* PBGitSidebarView.xib in Resources */,
12701274
D85B939310E3D8B4007F3C28 /* PBCreateBranchSheet.xib in Resources */,
12711275
D889EB3110E6BCBB00F08413 /* PBCreateTagSheet.xib in Resources */,
12721276
D8357535112640F100DE249D /* PBRemoteProgressSheet.xib in Resources */,
12731277
D8083C47111F136400337480 /* PBAddRemoteSheet.xib in Resources */,
12741278
D8083DCD111F918900337480 /* PBCloneRepsitoryToSheet.xib in Resources */,
12751279
D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */,
1276-
F58DB56010566E3900CFDF4A /* PBGitSidebarView.xib in Resources */,
12771280
D85810551127476E007F254B /* StageView.png in Resources */,
12781281
D858108311274D28007F254B /* Branch.png in Resources */,
12791282
D858108411274D28007F254B /* RemoteBranch.png in Resources */,
@@ -1603,7 +1606,6 @@
16031606
"\"$(SRCROOT)\"",
16041607
);
16051608
GCC_DYNAMIC_NO_PIC = NO;
1606-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
16071609
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
16081610
GCC_MODEL_TUNING = G5;
16091611
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1662,7 +1664,6 @@
16621664
GCC_WARN_UNUSED_VARIABLE = YES;
16631665
INFOPLIST_PREPROCESS = YES;
16641666
MACOSX_DEPLOYMENT_TARGET = 10.5;
1665-
PREBINDING = NO;
16661667
SDKROOT = macosx10.6;
16671668
};
16681669
name = Debug;
@@ -1679,7 +1680,6 @@
16791680
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
16801681
INFOPLIST_PREPROCESS = YES;
16811682
MACOSX_DEPLOYMENT_TARGET = 10.5;
1682-
PREBINDING = NO;
16831683
SDKROOT = macosx10.6;
16841684
};
16851685
name = Release;
@@ -1691,7 +1691,6 @@
16911691
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
16921692
COPY_PHASE_STRIP = NO;
16931693
GCC_DYNAMIC_NO_PIC = NO;
1694-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
16951694
GCC_MODEL_TUNING = G5;
16961695
GCC_OPTIMIZATION_LEVEL = 0;
16971696
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1704,7 +1703,6 @@
17041703
"-framework",
17051704
AppKit,
17061705
);
1707-
PREBINDING = NO;
17081706
PRODUCT_NAME = gitx_askpasswd;
17091707
SDKROOT = "";
17101708
};
@@ -1717,7 +1715,6 @@
17171715
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17181716
COPY_PHASE_STRIP = YES;
17191717
DEBUG_INFORMATION_FORMAT = dwarf;
1720-
GCC_ENABLE_FIX_AND_CONTINUE = NO;
17211718
GCC_MODEL_TUNING = G5;
17221719
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17231720
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -1728,7 +1725,6 @@
17281725
"-framework",
17291726
AppKit,
17301727
);
1731-
PREBINDING = NO;
17321728
PRODUCT_NAME = gitx_askpasswd;
17331729
SDKROOT = "";
17341730
ZERO_LINK = NO;
@@ -1740,7 +1736,6 @@
17401736
buildSettings = {
17411737
ALWAYS_SEARCH_USER_PATHS = NO;
17421738
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
1743-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
17441739
GCC_MODEL_TUNING = G5;
17451740
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17461741
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -1751,7 +1746,6 @@
17511746
"-framework",
17521747
AppKit,
17531748
);
1754-
PREBINDING = NO;
17551749
PRODUCT_NAME = gitx_askpasswd;
17561750
SDKROOT = "";
17571751
};
@@ -1763,7 +1757,6 @@
17631757
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17641758
COPY_PHASE_STRIP = NO;
17651759
GCC_DYNAMIC_NO_PIC = NO;
1766-
GCC_ENABLE_FIX_AND_CONTINUE = YES;
17671760
GCC_MODEL_TUNING = G5;
17681761
GCC_OPTIMIZATION_LEVEL = 0;
17691762
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1777,7 +1770,6 @@
17771770
"-framework",
17781771
AppKit,
17791772
);
1780-
PREBINDING = NO;
17811773
PRODUCT_NAME = gitx;
17821774
SDKROOT = "";
17831775
ZERO_LINK = YES;
@@ -1790,7 +1782,6 @@
17901782
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
17911783
COPY_PHASE_STRIP = YES;
17921784
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1793-
GCC_ENABLE_FIX_AND_CONTINUE = NO;
17941785
GCC_MODEL_TUNING = G5;
17951786
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17961787
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -1802,7 +1793,6 @@
18021793
"-framework",
18031794
AppKit,
18041795
);
1805-
PREBINDING = NO;
18061796
PRODUCT_NAME = gitx;
18071797
SDKROOT = "";
18081798
ZERO_LINK = NO;
@@ -1827,7 +1817,6 @@
18271817
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
18281818
COPY_PHASE_STRIP = YES;
18291819
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1830-
GCC_ENABLE_FIX_AND_CONTINUE = NO;
18311820
INFOPLIST_PREPROCESS = YES;
18321821
PRODUCT_NAME = "Generate PList Prefix";
18331822
SDKROOT = "";
@@ -1847,7 +1836,7 @@
18471836
defaultConfigurationIsVisible = 0;
18481837
defaultConfigurationName = Release;
18491838
};
1850-
26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */ = {
1839+
26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "gitx" */ = {
18511840
isa = XCConfigurationList;
18521841
buildConfigurations = (
18531842
26FC0A890875C7B200E6366F /* Debug */,

‎PBRefController.m

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,14 @@ - (void)showConfirmPushRefSheet:(PBGitRef *)ref remote:(PBGitRef *)remoteRef
8888
if (remoteRef)
8989
[info setObject:remoteRef forKey:kGitXRemoteType];
9090

91-
[alert beginSheetModalForWindow:[historyController.repository.windowController window]
92-
modalDelegate:self
93-
didEndSelector:@selector(confirmPushRefSheetDidEnd:returnCode:contextInfo:)
94-
contextInfo:info];
95-
}
96-
97-
- (void)confirmPushRefSheetDidEnd:(NSAlert *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
98-
{
99-
[[sheet window] orderOut:nil];
100-
101-
if ([[sheet suppressionButton] state] == NSOnState)
91+
NSInteger returnCode=[alert runModal];
92+
93+
if ([[alert suppressionButton] state] == NSOnState)
10294
[PBGitDefaults suppressDialogWarningForDialog:kDialogConfirmPush];
10395

10496
if (returnCode == NSAlertDefaultReturn) {
105-
PBGitRef *ref = [(NSDictionary *)contextInfo objectForKey:kGitXBranchType];
106-
PBGitRef *remoteRef = [(NSDictionary *)contextInfo objectForKey:kGitXRemoteType];
97+
PBGitRef *ref = [info objectForKey:kGitXBranchType];
98+
PBGitRef *remoteRef = [info objectForKey:kGitXRemoteType];
10799

108100
[historyController.repository beginPushRef:ref toRemote:remoteRef];
109101
}

0 commit comments

Comments
 (0)