From 2a693de4dfb684332e9b9a1f748914c6da08206c Mon Sep 17 00:00:00 2001
From: Sven Weidauer <sven.weidauer@gmail.com>
Date: Sat, 26 Feb 2011 10:35:44 +0000
Subject: [PATCH] Not retaining outlets. Fixing memory leak for favicon.

svn path=/trunk/netsurf/; revision=11821
---
 cocoa/BookmarksController.h     |  4 ++--
 cocoa/BrowserViewController.h   |  2 +-
 cocoa/BrowserViewController.m   |  1 +
 cocoa/BrowserWindowController.h | 10 +++++-----
 cocoa/HistoryWindowController.h |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cocoa/BookmarksController.h b/cocoa/BookmarksController.h
index 494ee0533..aa71a1ac0 100644
--- a/cocoa/BookmarksController.h
+++ b/cocoa/BookmarksController.h
@@ -28,8 +28,8 @@
 	NSMenu *defaultMenu;
 }
 
-@property (readwrite, retain, nonatomic) IBOutlet NSMenu *defaultMenu;
-@property (readwrite, retain, nonatomic) IBOutlet TreeView *view;
+@property (readwrite, assign, nonatomic) IBOutlet NSMenu *defaultMenu;
+@property (readwrite, assign, nonatomic) IBOutlet TreeView *view;
 
 - (IBAction) openBookmarkURL: (id) sender;
 - (IBAction) addBookmark: (id) sender;
diff --git a/cocoa/BrowserViewController.h b/cocoa/BrowserViewController.h
index ec98c0d60..6f409b395 100644
--- a/cocoa/BrowserViewController.h
+++ b/cocoa/BrowserViewController.h
@@ -39,7 +39,7 @@ struct browser_window;
 
 @property (readwrite, assign, nonatomic) struct browser_window *browser;
 @property (readwrite, copy, nonatomic) NSString *url;
-@property (readwrite, retain, nonatomic) IBOutlet BrowserView *browserView;
+@property (readwrite, assign, nonatomic) IBOutlet BrowserView *browserView;
 @property (readwrite, retain, nonatomic) BrowserWindowController *windowController;
 @property (readwrite, copy, nonatomic) NSString *title;
 @property (readwrite, copy, nonatomic) NSString *status;
diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m
index 5f59f780c..8a2bbf043 100644
--- a/cocoa/BrowserViewController.m
+++ b/cocoa/BrowserViewController.m
@@ -48,6 +48,7 @@
 	[self setWindowController: nil];
 	[self setTitle: nil];
 	[self setStatus: nil];
+	[self setFavicon: nil];
 	
 	[super dealloc];
 }
diff --git a/cocoa/BrowserWindowController.h b/cocoa/BrowserWindowController.h
index 17fc0bcd7..2f29b4ca2 100644
--- a/cocoa/BrowserWindowController.h
+++ b/cocoa/BrowserWindowController.h
@@ -32,11 +32,11 @@
 	BrowserViewController *activeBrowser;
 }
 
-@property (readwrite, retain, nonatomic) IBOutlet PSMTabBarControl *tabBar;
-@property (readwrite, retain, nonatomic) IBOutlet NSTabView *tabView;
-@property (readwrite, retain, nonatomic) IBOutlet URLFieldCell *urlField;
-@property (readwrite, retain, nonatomic) IBOutlet NSObjectController *activeBrowserController;
-@property (readwrite, retain, nonatomic) IBOutlet NSSegmentedControl *navigationControl;
+@property (readwrite, assign, nonatomic) IBOutlet PSMTabBarControl *tabBar;
+@property (readwrite, assign, nonatomic) IBOutlet NSTabView *tabView;
+@property (readwrite, assign, nonatomic) IBOutlet URLFieldCell *urlField;
+@property (readwrite, assign, nonatomic) IBOutlet NSObjectController *activeBrowserController;
+@property (readwrite, assign, nonatomic) IBOutlet NSSegmentedControl *navigationControl;
 @property (readwrite, assign, nonatomic) IBOutlet NSButton *historyButton;
 
 @property (readwrite, assign, nonatomic) BrowserViewController *activeBrowser;
diff --git a/cocoa/HistoryWindowController.h b/cocoa/HistoryWindowController.h
index b590dfe1d..30ba8049a 100644
--- a/cocoa/HistoryWindowController.h
+++ b/cocoa/HistoryWindowController.h
@@ -26,6 +26,6 @@
 	TreeView *view;
 }
 
-@property (readwrite, retain, nonatomic) IBOutlet TreeView *view;
+@property (readwrite, assign, nonatomic) IBOutlet TreeView *view;
 
 @end