From 076e07d5d94a48098b3461f5d8fc855e6c795c12 Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Mon, 5 Nov 2012 22:32:52 +0000
Subject: [PATCH] Disabled stuff - so it will compile.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/Identity/IdDialog.cpp  | 16 +++++----
 .../src/gui/Identity/IdEditDialog.cpp         | 35 ++++++++++---------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 696acae20..2a1d78fce 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -171,11 +171,12 @@ void IdDialog::insertIdDetails(uint32_t token)
 	ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName));
 	//ui.lineEdit_KeyId->setText(QString::fromStdString(data.mKeyId));
 	ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
-	ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mGpgIdHash));
-	ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
-	ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
-	ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
-	
+	ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
+	//ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
+	//ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
+	//ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
+
+#if 0	
 	if (data.mIdType & RSID_RELATION_YOURSELF)
 	{
 		ui.radioButton_IdYourself->setChecked(true);
@@ -210,6 +211,7 @@ void IdDialog::insertIdDetails(uint32_t token)
 		ui.pushButton_Delete->setEnabled(false);
 		ui.pushButton_EditId->setEnabled(false);
 	}
+#endif
 }
 
 void IdDialog::checkUpdate()
@@ -315,6 +317,7 @@ void IdDialog::insertIdList(uint32_t token)
 		{
 			ok = true;
 		}
+#if 0
 		else if (data.mIdType & RSID_TYPE_PSEUDONYM)
 		{
  			if (acceptPseudo)
@@ -351,6 +354,7 @@ void IdDialog::insertIdList(uint32_t token)
 				}
 			}
 		}
+#endif
 
 		if (!ok)
 		{
@@ -363,7 +367,7 @@ void IdDialog::insertIdList(uint32_t token)
 		//item->setText(RSID_COL_KEYID, QString::fromStdString(data.mKeyId));
 		item->setText(RSID_COL_NICKNAME, QString::fromStdString(data.mMeta.mGroupName));
 		item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId));
-		item->setText(RSID_COL_IDTYPE, QString::fromStdString(rsIdTypeToString(data.mIdType)));
+		//item->setText(RSID_COL_IDTYPE, QString::fromStdString(rsIdTypeToString(data.mIdType)));
 
                 tree->addTopLevelItem(item);
 	}
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 17abb84d7..8f3bfd407 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -146,7 +146,8 @@ void IdEditDialog::loadExistingId(uint32_t token)
 
 	data = datavector[0];
 
-	bool pseudo = (data.mIdType & RSID_TYPE_PSEUDONYM);
+
+	bool pseudo = false; //(data.mIdType & RSID_TYPE_PSEUDONYM);
 
 	if (pseudo)
 	{
@@ -175,13 +176,13 @@ void IdEditDialog::loadExistingId(uint32_t token)
 	}
 	else
 	{
-		ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mGpgIdHash));
+		ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
 
-		if (data.mGpgIdKnown)
+		if (0) //if (data.mGpgIdKnown)
 		{
-			ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
-			ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
-			ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
+			//ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
+			//ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
+			//ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
 		}
 		else
 		{
@@ -208,7 +209,7 @@ void IdEditDialog::updateId()
 		return;
 	}
 
-	rid.mIdType = RSID_RELATION_YOURSELF;
+	//rid.mIdType = RSID_RELATION_YOURSELF;
 	if (ui.checkBox_NewId->isChecked())
 	{
 		rid.mMeta.mGroupId = "";
@@ -220,21 +221,21 @@ void IdEditDialog::updateId()
 
 	if (ui.radioButton_GpgId->isChecked())
 	{
-		rid.mIdType |= RSID_TYPE_REALID;
+		//rid.mIdType |= RSID_TYPE_REALID;
 
-		rid.mGpgId = ui.lineEdit_GpgId->text().toStdString();
-		rid.mGpgIdHash = ui.lineEdit_GpgHash->text().toStdString();
-		rid.mGpgName = ui.lineEdit_GpgName->text().toStdString();
-		rid.mGpgEmail = ui.lineEdit_GpgEmail->text().toStdString();
+		//rid.mGpgId = ui.lineEdit_GpgId->text().toStdString();
+		rid.mPgpIdHash = ui.lineEdit_GpgHash->text().toStdString();
+		//rid.mGpgName = ui.lineEdit_GpgName->text().toStdString();
+		//rid.mGpgEmail = ui.lineEdit_GpgEmail->text().toStdString();
 	}
 	else
 	{
-		rid.mIdType |= RSID_TYPE_PSEUDONYM;
+		//rid.mIdType |= RSID_TYPE_PSEUDONYM;
 
-		rid.mGpgId = "";
-		rid.mGpgIdHash = "";
-		rid.mGpgName = "";
-		rid.mGpgEmail = "";
+		//rid.mGpgId = "";
+		rid.mPgpIdHash = "";
+		//rid.mGpgName = "";
+		//rid.mGpgEmail = "";
 	}
 
 	// TODO.