Merge commit 'refs/remotes/roddi/sidebar'

ApplicationController.h

@@ -12,7 +12,7 @@
 @class PBCLIProxy;
 @class PBCloneRepositoryPanel;
 
-@interface ApplicationController : NSObject
+@interface ApplicationController : NSObject <NSWindowDelegate>
 {
 	IBOutlet NSWindow *window;
 	IBOutlet id firstResponder;

DBPrefsWindowController.h

@@ -42,7 +42,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController {
+@interface DBPrefsWindowController : NSWindowController <NSAnimationDelegate, NSToolbarDelegate> {
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;

DBPrefsWindowController.m

@@ -370,7 +370,7 @@ static DBPrefsWindowController *_sharedPrefsWindowController = nil;
 	NSEnumerator *subviewsEnum = [[contentSubview subviews] reverseObjectEnumerator];
 
 		// This is our visible view. Just get past it.
-	subview = [subviewsEnum nextObject];
+	[subviewsEnum nextObject];
 
 		// Remove everything else. There should be just one, but
 		// if the user does a lot of fast clicking, we might have

PBCLIProxy.m

@@ -80,9 +80,11 @@
                                    suggestion], NSLocalizedFailureReasonErrorKey,
                                   recoveryInfo, NSLocalizedRecoverySuggestionErrorKey, nil];
 
-        *error = [NSError errorWithDomain:PBCLIProxyErrorDomain code:errCode userInfo:userInfo];
-
-        fprintf(stderr, "\t%s\n", [[*error localizedFailureReason] UTF8String]);
+        if (error)
+        {
+            *error = [NSError errorWithDomain:PBCLIProxyErrorDomain code:errCode userInfo:userInfo];
+            fprintf(stderr, "\t%s\n", [[*error localizedFailureReason] UTF8String]);
+        }
     }
 
     // NSLog(@"document = %@ at path = %@", document, repositoryPath);

PBGitRevisionCell.m

@@ -189,7 +189,7 @@
 {
 	[[NSColor blackColor] setStroke];
 
-	NSRect lastRect;
+	NSRect lastRect = NSMakeRect(0, 0, 0, 0);
 	int index = 0;
 	for (NSValue *rectValue in [self rectsForRefsinRect:*refRect])
 	{

PBGitSidebarController.h

@@ -14,7 +14,7 @@
 @class PBGitCommitController;
 @class ApplicationController;
 
-@interface PBGitSidebarController : PBViewController {
+@interface PBGitSidebarController : PBViewController <NSOutlineViewDelegate> {
 	IBOutlet NSWindow *window;
 	IBOutlet NSOutlineView *sourceView;
 	IBOutlet NSView *sourceListControlsView;

PBGitWindowController.h

@@ -11,7 +11,7 @@
 
 @class PBViewController, PBGitSidebarController, PBGitHistoryController;
 
-@interface PBGitWindowController : NSWindowController {
+@interface PBGitWindowController : NSWindowController <NSWindowDelegate> {
 	__weak PBGitRepository* repository;
 
 	__weak PBViewController *contentController;

PBRepositoryDocumentController.m

@@ -72,7 +72,8 @@
         NSString * reason = @"It does not appear to be a git repository.";
         NSString * suggestion = @"Make sure there really is a \u201c.git\u201d folder somewhere in the path hierarchy you are trying to open";
         NSDictionary * errInfo = [NSDictionary dictionaryWithObjectsAndKeys:reason, NSLocalizedFailureReasonErrorKey, suggestion, NSLocalizedRecoverySuggestionErrorKey, nil];
-        *outError = [NSError errorWithDomain:NSCocoaErrorDomain code:PBNotAGitRepositoryErrorCode userInfo:errInfo];
+        if (outError)
+            *outError = [NSError errorWithDomain:NSCocoaErrorDomain code:PBNotAGitRepositoryErrorCode userInfo:errInfo];
         return nil;
     }
     return [super openDocumentWithContentsOfURL:absoluteURL display:displayDocument error:outError];

gitx_askpasswd_main.m

@@ -18,7 +18,7 @@
 #define	PASSLABELHEIGHT			16.0
 
 
-@interface GAPAppDelegate : NSObject
+@interface GAPAppDelegate : NSObject <NSApplicationDelegate>
 {
 	NSPanel*			mPasswordPanel;
 	NSSecureTextField*	mPasswordField;