Merge branch 'refs/heads/experimental' into stashes

Conflicts:
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBRefController.m

Author: coresystems-krt

ApplicationController.h

@@ -32,7 +32,8 @@
 - (IBAction)installCliTool:(id)sender;
 
 - (IBAction)saveAction:sender;
-- (IBAction) showHelp:(id) sender;
+- (IBAction)showHelp:(id)sender;
+- (IBAction)reportAProblem:(id)sender;
 
-- (IBAction) showCloneRepository:(id)sender;
+- (IBAction)showCloneRepository:(id)sender;
 @end

ApplicationController.m

@@ -64,6 +64,7 @@ - (void)registerServices
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
 	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
+    [[SUUpdater sharedUpdater] setDelegate:self];
 
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
 	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
@@ -196,11 +197,6 @@ - (IBAction)installCliTool:(id)sender;
     former cannot be found), the system's temporary directory.
  */
 
-- (IBAction) showHelp:(id) sender
-{
-	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.frim.nl/user_manual.html"]];
-}
-
 - (NSString *)applicationSupportFolder {
 
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
@@ -380,4 +376,44 @@ - (void) dealloc {
     [managedObjectModel release], managedObjectModel = nil;
     [super dealloc];
 }
+
+
+#pragma mark Sparkle delegate methods
+
+- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile
+{
+	NSArray *keys = [NSArray arrayWithObjects:@"key", @"displayKey", @"value", @"displayValue", nil];
+	NSMutableArray *feedParameters = [NSMutableArray array];
+
+    // only add parameters if the profile is being sent this time
+    if (sendingProfile) {
+        NSString *CFBundleGitVersion = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleGitVersion"];
+		if (CFBundleGitVersion)
+			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"CFBundleGitVersion", @"Full Version", CFBundleGitVersion, CFBundleGitVersion, nil] 
+																  forKeys:keys]];
+
+        NSString *gitVersion = [PBGitBinary version];
+		if (gitVersion)
+			[feedParameters addObject:[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"gitVersion", @"git Version", gitVersion, gitVersion, nil] 
+																  forKeys:keys]];
+	}
+
+    return feedParameters;
+}
+
+
+#pragma mark Help menu
+
+- (IBAction)showHelp:(id)sender
+{
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.frim.nl/user_manual.html"]];
+}
+
+- (IBAction)reportAProblem:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.lighthouseapp.com/tickets"]];
+}
+
+
+
 @end