Merge branch 'stable'

* stable:
  PBGitConfig: Add missing sentinel
  Remove use of deprecated stringWithCString
  HistoryView: only add parents if parents array exists
  keyboardNavigation: Fix keys 'c' and 'v' from webView
  Site: add link to Twitter

Conflicts:
	Site/text/contact.markdown

Author: Pieter de Bie

PBGitBinary.m

@@ -66,7 +66,7 @@ + (void) initialize
 
 	// Try to find the path of the Git binary
 	char* path = getenv("GIT_PATH");
-	if (path && [self acceptBinary:[NSString stringWithCString:path]])
+	if (path && [self acceptBinary:[NSString stringWithUTF8String:path]])
 		return;
 
 	// No explicit path. Try it with "which"

PBGitConfig.m

@@ -79,7 +79,7 @@ - (void) setValue:(id)value forKeyPath:(NSString *)path
 
 	// Check if it exists globally. In that case, write it as a global
 
-	NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path];
+	NSArray *arguments = [NSArray arrayWithObjects:@"config", @"--global", @"--get", path, nil];
 	int ret;
 	[PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:arguments inDir:nil retValue:&ret];
 	if (!ret) // It exists globally

Site/templates/site.html

@@ -40,7 +40,7 @@
 				<%= @body %>
 			</div>
 			<div id="footer">
-				© Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:[email protected]">Pieter de Bie</a> is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
+				© Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:[email protected]">Pieter de Bie</a> (<a href="http://twitter.com/pdebie">@pdebie</a>) is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
 			</div>
 		</div>
 	<script type="text/javascript">

Site/text/contact.markdown

@@ -4,4 +4,6 @@ Contact
 
 The GitX repository can be found on Github at [http://github.com/pieter/gitx](http://www.github.com/pieter/gitx/wikis).
 
-GitX has a mailing list at [[email protected]](mailto:[email protected]) to which you can email any questions or patches. GitX is actively maintained by Pieter de Bie. You can email him at [[email protected]](mailto:[email protected]).
+GitX has a mailing list at [[email protected]](mailto:[email protected]) to which you can email any questions or patches.
+
+GitX is actively maintained by Pieter de Bie. You can email him at [[email protected]](mailto:[email protected]) or on twitter <a href="http://twitter.com/pdebie">@pdebie</a>

gitx.m

@@ -133,7 +133,7 @@ int main(int argc, const char** argv)
 	NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:argc];
 	int i = 0;
 	for (i = 0; i < argc; i++)
-		[arguments addObject: [NSString stringWithCString:argv[i]]];
+		[arguments addObject: [NSString stringWithUTF8String:argv[i]]];
 
 	if (!isatty(STDIN_FILENO) && fdopen(STDIN_FILENO, "r"))
 		handleSTDINDiff(proxy);

html/views/history/history.js

@@ -184,15 +184,18 @@ var loadCommit = function(commitObject, currentRef) {
 		}
 	}
 
+	// Scroll to top
+	scroll(0, 0);
+
+	if (!commit.parents)
+		return;
+
 	for (var i = 0; i < commit.parents.length; i++) {
 		var newRow = $("commit_header").insertRow(-1);
 		newRow.innerHTML = "<td class='property_name'>Parent:</td><td>" +
 			"<a href='' onclick='selectCommit(this.innerHTML); return false;'>" +
 			commit.parents[i] + "</a></td>";
 	}
-
-	// Scroll to top
-	scroll(0, 0);
 }
 
 var showDiff = function() {