From a91c1a64d9498f151fa89b08268184bd696a7053 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Thu, 14 Mar 2013 01:21:30 +0100
Subject: [PATCH] Fixed memory leak in IconHelper First test with password
 show/hide input

---
 MacPass/InspectorTabView.xib           | 206 +++++++++++++------------
 MacPass/MPIconHelper.m                 |   2 +-
 MacPass/MPInspectorTabViewController.m |  34 ++++
 MacPass/MacPass-Info.plist             |   2 +-
 4 files changed, 142 insertions(+), 102 deletions(-)

diff --git a/MacPass/InspectorTabView.xib b/MacPass/InspectorTabView.xib
index a6718655..0b0359ff 100644
--- a/MacPass/InspectorTabView.xib
+++ b/MacPass/InspectorTabView.xib
@@ -52,7 +52,7 @@
 					<object class="NSSegmentedControl" id="234157826">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{68, 487}, {144, 20}}</string>
+						<string key="NSFrame">{{67, 520}, {144, 20}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="535016823"/>
@@ -89,7 +89,7 @@
 					<object class="NSTextField" id="787130496">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{77, 530}, {41, 17}}</string>
+						<string key="NSFrame">{{77, 563}, {41, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="234157826"/>
@@ -139,7 +139,7 @@
 							<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
 							<string>NeXT TIFF v4.0 pasteboard type</string>
 						</set>
-						<string key="NSFrame">{{24, 514}, {48, 48}}</string>
+						<string key="NSFrame">{{24, 547}, {48, 48}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="787130496"/>
@@ -164,7 +164,7 @@
 					<object class="NSTabView" id="535016823">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">12</int>
-						<string key="NSFrame">{{0, -2}, {280, 482}}</string>
+						<string key="NSFrameSize">{278, 513}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="936537698"/>
@@ -179,7 +179,7 @@
 										<object class="NSTextField" id="308700284">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{40, 440}, {41, 17}}</string>
+											<string key="NSFrame">{{40, 471}, {41, 17}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="732515963"/>
@@ -200,7 +200,7 @@
 										<object class="NSTextField" id="732515963">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{86, 440}, {174, 22}}</string>
+											<string key="NSFrame">{{86, 471}, {172, 22}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="913444671"/>
@@ -235,7 +235,7 @@
 										<object class="NSTextField" id="913444671">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{14, 410}, {67, 17}}</string>
+											<string key="NSFrame">{{14, 441}, {67, 17}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="467497732"/>
@@ -256,7 +256,7 @@
 										<object class="NSSecureTextField" id="122917778">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{86, 315}, {135, 22}}</string>
+											<string key="NSFrame">{{86, 346}, {133, 22}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="284205998"/>
@@ -281,7 +281,7 @@
 										<object class="NSTextField" id="467497732">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{86, 408}, {174, 22}}</string>
+											<string key="NSFrame">{{86, 439}, {172, 22}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="435600766"/>
@@ -303,7 +303,7 @@
 										<object class="NSTextField" id="620237932">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{86, 376}, {135, 22}}</string>
+											<string key="NSFrame">{{86, 407}, {133, 22}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="12214388"/>
@@ -325,7 +325,7 @@
 										<object class="NSTextField" id="435600766">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{52, 378}, {29, 17}}</string>
+											<string key="NSFrame">{{52, 409}, {29, 17}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="620237932"/>
@@ -346,7 +346,7 @@
 										<object class="NSButton" id="12214388">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{229, 374}, {31, 25}}</string>
+											<string key="NSFrame">{{227, 405}, {31, 25}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="875229144"/>
@@ -375,7 +375,7 @@
 										<object class="NSTextField" id="875229144">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{17, 317}, {64, 17}}</string>
+											<string key="NSFrame">{{17, 348}, {64, 17}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="122917778"/>
@@ -396,7 +396,7 @@
 										<object class="NSButton" id="284205998">
 											<reference key="NSNextResponder" ref="936537698"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{229, 313}, {31, 25}}</string>
+											<string key="NSFrame">{{227, 344}, {31, 25}}</string>
 											<reference key="NSSuperview" ref="936537698"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView"/>
@@ -420,7 +420,7 @@
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrameSize">{280, 482}</string>
+									<string key="NSFrameSize">{278, 513}</string>
 									<reference key="NSSuperview" ref="535016823"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="308700284"/>
@@ -436,7 +436,8 @@
 									<nil key="NSNextResponder"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews"/>
-									<string key="NSFrameSize">{280, 482}</string>
+									<string key="NSFrameSize">{278, 513}</string>
+									<reference key="NSNextKeyView" ref="535016823"/>
 									<string key="NSReuseIdentifierKey">_NS:28</string>
 								</object>
 								<string key="NSLabel">Notes</string>
@@ -458,7 +459,7 @@
 						</array>
 					</object>
 				</array>
-				<string key="NSFrameSize">{280, 579}</string>
+				<string key="NSFrameSize">{278, 612}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1013751338"/>
@@ -602,6 +603,70 @@
 						<int key="objectID">1</int>
 						<reference key="object" ref="1005"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="764430680">
+								<reference key="firstItem" ref="535016823"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="556344554">
+								<reference key="firstItem" ref="535016823"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1007512664">
+								<reference key="firstItem" ref="535016823"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="903694235">
+								<reference key="firstItem" ref="535016823"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="234157826"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1005"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="698059506">
 								<reference key="firstItem" ref="1005"/>
 								<int key="firstAttribute">6</int>
@@ -666,70 +731,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="556344554">
-								<reference key="firstItem" ref="535016823"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1005"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1007512664">
-								<reference key="firstItem" ref="535016823"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1005"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="1040366443">
-								<reference key="firstItem" ref="1005"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="535016823"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">-2</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="903694235">
-								<reference key="firstItem" ref="535016823"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="234157826"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="1005"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="7482984">
 								<reference key="firstItem" ref="787130496"/>
 								<int key="firstAttribute">5</int>
@@ -1340,16 +1341,6 @@
 						<reference key="object" ref="346815708"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">148</int>
-						<reference key="object" ref="903694235"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1040366443"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">151</int>
 						<reference key="object" ref="1007512664"/>
@@ -1635,14 +1626,24 @@
 						<reference key="object" ref="560148047"/>
 						<reference key="parent" ref="1005"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">105</int>
+						<reference key="object" ref="7482984"/>
+						<reference key="parent" ref="1005"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">147</int>
 						<reference key="object" ref="650676592"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">105</int>
-						<reference key="object" ref="7482984"/>
+						<int key="objectID">148</int>
+						<reference key="object" ref="903694235"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">404</int>
+						<reference key="object" ref="764430680"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 				</array>
@@ -1651,20 +1652,20 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="1.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
 					<reference ref="650676592"/>
 					<reference ref="26781143"/>
 					<reference ref="497278534"/>
 					<reference ref="1047670962"/>
 					<reference ref="7482984"/>
-					<reference ref="903694235"/>
-					<reference ref="1040366443"/>
-					<reference ref="1007512664"/>
-					<reference ref="556344554"/>
 					<reference ref="560148047"/>
 					<reference ref="346815708"/>
 					<reference ref="550153534"/>
 					<reference ref="698059506"/>
+					<reference ref="903694235"/>
+					<reference ref="1007512664"/>
+					<reference ref="556344554"/>
+					<reference ref="764430680"/>
 				</array>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="100.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1684,7 +1685,6 @@
 				<string key="135.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="147.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1743,6 +1743,7 @@
 				<string key="332.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="334.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="53.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1790,7 +1791,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">372</int>
+			<int key="maxID">404</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1816,6 +1817,7 @@
 						<string key="passwordTextField">NSSecureTextField</string>
 						<string key="tabControl">NSSegmentedControl</string>
 						<string key="tabView">NSTabView</string>
+						<string key="titleOrNameLabel">NSTextField</string>
 						<string key="titleTextField">NSTextField</string>
 						<string key="togglePasswordDisplayButton">NSButton</string>
 						<string key="usernameTextField">NSTextField</string>
@@ -1849,6 +1851,10 @@
 							<string key="name">tabView</string>
 							<string key="candidateClassName">NSTabView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="titleOrNameLabel">
+							<string key="name">titleOrNameLabel</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="titleTextField">
 							<string key="name">titleTextField</string>
 							<string key="candidateClassName">NSTextField</string>
diff --git a/MacPass/MPIconHelper.m b/MacPass/MPIconHelper.m
index 5a2f3eaa..c33198da 100644
--- a/MacPass/MPIconHelper.m
+++ b/MacPass/MPIconHelper.m
@@ -26,7 +26,7 @@
     MPIconType iconType = (MPIconType)[iconNumber integerValue];
     [icons addObject:[MPIconHelper icon:iconType]];
   }
-  return icons;
+  return [icons autorelease];
 }
 
 + (NSDictionary *)availableIconNames {
diff --git a/MacPass/MPInspectorTabViewController.m b/MacPass/MPInspectorTabViewController.m
index 8ac662b5..93873a10 100644
--- a/MacPass/MPInspectorTabViewController.m
+++ b/MacPass/MPInspectorTabViewController.m
@@ -52,6 +52,8 @@
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [_selectedGroup release];
+  [_selectedEntry release];
   [super dealloc];
 }
 
@@ -109,6 +111,10 @@
   [self.itemImageView setImage:[MPIconHelper icon:(MPIconType)self.selectedGroup.image ]];
   [self.titleOrNameLabel setStringValue:NSLocalizedString(@"NAME",@"")];
   [self.titleTextField setStringValue:self.selectedGroup.name];
+  [self.passwordTextField setStringValue:@""];
+  [self.usernameTextField setStringValue:@""];
+  [self.URLTextField setStringValue:@""];
+
   [self _setInputEnabled:YES];
 }
 
@@ -189,5 +195,33 @@
 
 
 - (IBAction)togglePasswordDisplay:(id)sender {
+  NSTextFieldCell *cell = nil;
+  NSFont *font = [[self.passwordTextField font] retain];
+  if([sender respondsToSelector:@selector(state)]) {
+    switch([sender state]) {
+      case NSOnState:
+        cell = [[NSTextFieldCell alloc] init];
+        break;
+      case NSOffState:
+        cell = [[NSSecureTextFieldCell alloc] init];
+        break;
+      case NSMixedState:
+        break;
+    }
+  }
+  if(cell) {
+    [cell setBezelStyle:NSTextFieldSquareBezel];
+    [cell setBordered:YES];
+    [cell setBezeled:YES];
+    [cell setDrawsBackground:YES];
+    [cell setFont:font];
+    [cell setEditable:YES];
+    [self.passwordTextField setCell:cell];
+    [self.passwordTextField setNeedsDisplay:YES];
+    //[self.passwordTextField setStringValue:[self.passwordTextField stringValue]];
+    [cell release];
+  }
+  [font release];
 }
+
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 2048bf1c..1f9d4ccf 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>56A</string>
+	<string>58B</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>