Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix memory leaks

  • Loading branch information...
commit 515b66f09aa0bcb331ec4c00d9f14abdd87535bb 1 parent cad9281
@brotherbard authored
View
9 GLFileView.m
@@ -78,7 +78,7 @@ - (void) showFile
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:fileTxt]];
}
-#ifdef DEBUG
+#if 0
NSString *dom=[[[[view mainFrame] DOMDocument] documentElement] outerHTML];
NSString *tmpFile=@"~/tmp/test.html";
[dom writeToFile:[tmpFile stringByExpandingTildeInPath] atomically:true encoding:NSUTF8StringEncoding error:nil];
@@ -151,6 +151,13 @@ - (void) didLoad
[self showFile];
}
+- (void)closeView
+{
+ [historyController.treeController removeObserver:self forKeyPath:@"selection"];
+
+ [super closeView];
+}
+
- (NSString *) parseHTML:(NSString *)txt
{
txt=[txt stringByReplacingOccurrencesOfString:@"&" withString:@"&"];
View
7 GitX.xcodeproj/project.pbxproj
@@ -1158,7 +1158,14 @@
isa = PBXProject;
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* GitTest */;
projectDirPath = "";
projectRoot = "";
View
2  PBGitHistoryController.h
@@ -18,6 +18,7 @@
@class PBRefController;
@class QLPreviewPanel;
@class PBCommitList;
+@class GLFileView;
@class PBGitSHA;
@class PBHistorySearchController;
@@ -34,6 +35,7 @@
IBOutlet PBWebHistoryController *webHistoryController;
QLPreviewPanel* previewPanel;
IBOutlet PBHistorySearchController *searchController;
+ IBOutlet GLFileView *fileView;
IBOutlet PBGitGradientBarView *upperToolbarView;
IBOutlet NSButton *mergeButton;
View
2  PBGitHistoryController.m
@@ -23,6 +23,7 @@
#import "PBHistorySearchController.h"
#define QLPreviewPanel NSClassFromString(@"QLPreviewPanel")
#import "PBQLTextView.h"
+#import "GLFileView.h"
#define kHistorySelectedDetailIndexKey @"PBHistorySelectedDetailIndex"
@@ -493,6 +494,7 @@ - (void)closeView
}
[webHistoryController closeView];
+ [fileView closeView];
[super closeView];
}
View
44 PBGitHistoryView.xib
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15,8 +15,8 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>788</string>
- <string>788</string>
+ <string>804</string>
+ <string>804</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -29,13 +29,8 @@
<string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -496,7 +491,7 @@
<integer value="1"/>
</object>
</object>
- <string key="NS.format">d 'de' MMMM 'de' yyyy HH:mm</string>
+ <string key="NS.format">MMMM d, yyyy h:mm a</string>
<bool key="NS.natural">NO</bool>
</object>
<reference key="NSControlView" ref="254268962"/>
@@ -1982,13 +1977,23 @@
</object>
<int key="connectionID">487</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fileView</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="932676109"/>
+ </object>
+ <int key="connectionID">488</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object" ref="0"/>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
@@ -2890,7 +2895,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
- <string>{{2069, 399}, {955, 434}}</string>
+ <string>{{1559, 241}, {955, 434}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2928,7 +2933,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">487</int>
+ <int key="maxID">488</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3267,6 +3272,7 @@
<string>commitController</string>
<string>commitList</string>
<string>fileBrowser</string>
+ <string>fileView</string>
<string>historySplitView</string>
<string>localRemoteBranchesFilterItem</string>
<string>mergeButton</string>
@@ -3288,6 +3294,7 @@
<string>NSArrayController</string>
<string>PBCommitList</string>
<string>NSOutlineView</string>
+ <string>GLFileView</string>
<string>PBCollapsibleSplitView</string>
<string>NSButton</string>
<string>NSButton</string>
@@ -3312,6 +3319,7 @@
<string>commitController</string>
<string>commitList</string>
<string>fileBrowser</string>
+ <string>fileView</string>
<string>historySplitView</string>
<string>localRemoteBranchesFilterItem</string>
<string>mergeButton</string>
@@ -3349,6 +3357,10 @@
<string key="candidateClassName">NSOutlineView</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">fileView</string>
+ <string key="candidateClassName">GLFileView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">historySplitView</string>
<string key="candidateClassName">PBCollapsibleSplitView</string>
</object>
Please sign in to comment.
Something went wrong with that request. Please try again.