From 5ef5107b628bfe46db0a64bead5a3d18627ad9d6 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 23 Jan 2012 23:50:54 +0000 Subject: [PATCH] Allow ports to be specified once again. Fixes #555 --- SparkleLib/Git/SparkleFetcherGit.cs | 8 +++++--- SparkleShare/Mac/SparkleEventLog.cs | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs index e04a3045..160b52ff 100755 --- a/SparkleLib/Git/SparkleFetcherGit.cs +++ b/SparkleLib/Git/SparkleFetcherGit.cs @@ -51,7 +51,7 @@ namespace SparkleLib { if (!uri.Scheme.Equals ("ssh") && !uri.Scheme.Equals ("git")) { - uri = new Uri ("ssh://" + server); + uri = new Uri ("ssh://" + uri); } @@ -72,8 +72,10 @@ namespace SparkleLib { uri = new Uri ("ssh://git@gnome.org/git" + uri.AbsolutePath); } else { - if (string.IsNullOrEmpty (uri.UserInfo)) - uri = new Uri (uri.Scheme + "://git@" + uri.Host + uri.AbsolutePath); + if (string.IsNullOrEmpty (uri.UserInfo)) { + uri = new Uri (uri.Scheme + "://git@" + uri.Host + ":" + uri.Port + uri.AbsolutePath); + uri = new Uri (uri.ToString ().Replace (":-1", "")); + } } diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs index 09d3fee1..c46f53fd 100755 --- a/SparkleShare/Mac/SparkleEventLog.cs +++ b/SparkleShare/Mac/SparkleEventLog.cs @@ -71,9 +71,9 @@ namespace SparkleShare { this.hidden_close_button = new NSButton () { - Frame = new RectangleF (0, 0, 0, 0) + Frame = new RectangleF (0, 0, 0, 0), KeyEquivalentModifierMask = NSEventModifierMask.CommandKeyMask, - KeyEquivalent = "w", + KeyEquivalent = "w" }; this.hidden_close_button.Activated += delegate {