From 8c020c7502fcd3a303c565ff6681d59bac9caff8 Mon Sep 17 00:00:00 2001
From: kostas <kostas@noemail.net>
Date: Fri, 29 May 2015 19:11:10 +0000
Subject: [PATCH] Fixed incorrect remote search key

FossilOrigin-Name: 1f10dd85e5d7e95539baaea140623673b19f12f2
---
 manifest           | 14 +++++++-------
 manifest.uuid      |  2 +-
 src/MainWindow.cpp |  1 -
 src/Workspace.cpp  | 12 +++++++++---
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index f2b9c11..68d3f3d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\sworkspace\sremote\sstorage\nAdded\sDelete\sRemote\saction\nDouble-cliking\sa\sremote\striggers\sa\sremote\sediting\n
-D 2015-05-29T18:45:44.456
+C Fixed\sincorrect\sremote\ssearch\skey\n
+D 2015-05-29T19:11:10.714
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -224,7 +224,7 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5
 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp bc954c5923c874255399755b9d3eee6077e464f4
+F src/MainWindow.cpp bba716022fd683843abc07be47fdca3e15391e1f
 F src/MainWindow.h 1ecfb255c8e013cf4e2d07bfd485ed41d26c97c7
 F src/RemoteDialog.cpp 7f4272117080260c31c748e2ada3e33adc024826
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -238,7 +238,7 @@ F src/SettingsDialog.cpp 25be4c351dd21ea9132321944f42dc0bc22fb128
 F src/SettingsDialog.h b324dfd77ca3ad24fd83588aaf79a7e4c291e716
 F src/Utils.cpp 09ba0fc6d6d293ebbd2f7c7283286b68d3cb04fb
 F src/Utils.h e22c5d86722e3987894fa06bdee3d57597ff425e
-F src/Workspace.cpp c3ff643688224aaac2f96c4b3a5e1f96a407e16e
+F src/Workspace.cpp dd2dfb259fd917bd8434b5f00d438fdd9643242f
 F src/Workspace.h 7ae2e63196433ae34864d182e49e3a2f0726fb78
 F src/main.cpp d8c65ea5e54102e4989fef9fd8cfd4f13ef8a8f0
 F tools/git-push.sh 62cc58434cae5b7bcd6bd9d4cce8b08739f31cd7 x
@@ -252,7 +252,7 @@ F ui/MainWindow.ui 5857b45ed96fb027b6159e44742e9afaa3e89cfb
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 4c480cd595a32664d01c85bf74845c4282fc0068
-P 9674708cb5f2e8543e01d64211b6768d2cb726d6
-R e972a555bf8af66b3d0a2b5167c83ea1
+P 6c042af93ec30f09386497c176b9c0736ac47690
+R ddb33050a72347b140cbfa284e3483f6
 U kostas
-Z ac3734f99e92a433200bdfee8aa7103b
+Z d563886e07c96e5e0ebd6ac3d710981a
diff --git a/manifest.uuid b/manifest.uuid
index 83054fa..4675781 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c042af93ec30f09386497c176b9c0736ac47690
\ No newline at end of file
+1f10dd85e5d7e95539baaea140623673b19f12f2
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index fda4f60..14b74f5 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -2604,7 +2604,6 @@ void MainWindow::on_actionAddRemote_triggered()
 	}
 
 	url.setPassword("");
-	url.setUserName("");
 
 	getWorkspace().addRemote(url, name);
 	updateWorkspaceView();
diff --git a/src/Workspace.cpp b/src/Workspace.cpp
index 5065ea1..764a1f3 100644
--- a/src/Workspace.cpp
+++ b/src/Workspace.cpp
@@ -102,8 +102,14 @@ bool Workspace::switchWorkspace(const QString& workspace, QSettings &store)
 	QUrl default_remote;
 	if(fossil().getRemoteUrl(default_remote) && default_remote.isValid() && !default_remote.isEmpty())
 	{
-		addRemote(default_remote, default_remote.toDisplayString());
-		setRemoteDefault(default_remote);
+		default_remote.setPassword("");
+
+		// Add Default remote if not available already
+		if(findRemote(default_remote)==NULL)
+		{
+			addRemote(default_remote, default_remote.toDisplayString());
+			setRemoteDefault(default_remote);
+		}
 	}
 
 	return true;
@@ -311,7 +317,7 @@ bool Workspace::addRemote(const QUrl& url, const QString& name)
 	Q_ASSERT(url.password().isEmpty());
 
 	Remote r(name, url);
-	remotes.insert(r.name, r);
+	remotes.insert(url, r);
 	return true;
 }