From 42d2b62420dee416c689e9192257d7e9d8cecb78 Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Mon, 25 May 2009 11:45:07 +0000
Subject: [PATCH]  * Updated rspeers.h to match libretroshare.  * switched pgp
 password to encrypted entry  * corrected NetworkDialog / NetworkView to use
 validLvl instead of trustLvl.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/NetworkDialog.cpp | 6 +++---
 retroshare-gui/src/gui/NetworkView.cpp   | 2 +-
 retroshare-gui/src/gui/StartDialog.ui    | 6 +++++-
 retroshare-gui/src/rsiface/rspeers.h     | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 7e871e3b8..28ce47f3a 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -195,7 +195,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
 			}
 			else	// not a friend
 			{
-				if(detail.trustLvl > RS_TRUST_LVL_MARGINAL)		// it's a denied old friend.
+				if(detail.validLvl > RS_TRUST_LVL_MARGINAL)		// it's a denied old friend.
 					makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Accept friend" ), this );
 				else
 					makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Make friend" ), this );
@@ -203,7 +203,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
 				connect( makefriendAct , SIGNAL( triggered() ), this, SLOT( makeFriend() ) );
 				contextMnu.addAction( makefriendAct);
 #ifdef TODO
-				if(detail.trustLvl > RS_TRUST_LVL_MARGINAL)		// it's a denied old friend.
+				if(detail.validLvl > RS_TRUST_LVL_MARGINAL)		// it's a denied old friend.
 				{
 					deleteCertAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Delete certificate" ), this );
 					connect( deleteCertAct, SIGNAL( triggered() ), this, SLOT( deleteCert() ) );
@@ -454,7 +454,7 @@ void NetworkDialog::insertConnect()
 					item -> setToolTip(k,QString::fromStdString(detail.name) + QString(tr(" is trusting you. \nRight-click and select 'make friend' to be able to connect."))) ;
 			}
 #ifdef RS_USE_PGPSSL
-			else if (detail.trustLvl > GPGME_VALIDITY_MARGINAL)
+			else if (detail.validLvl > GPGME_VALIDITY_MARGINAL)
 			{
 				backgrndcolor=Qt::cyan;
 				item -> setIcon(0,(QIcon(IMAGE_DENIED)));
diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp
index 93e85f13f..1e9351740 100644
--- a/retroshare-gui/src/gui/NetworkView.cpp
+++ b/retroshare-gui/src/gui/NetworkView.cpp
@@ -170,7 +170,7 @@ void  NetworkView::insertPeers()
 		{
 			continue;
 		}
-		switch(detail.trustLvl)
+		switch(detail.validLvl)
 		{
 			default:
 			case GPGME_VALIDITY_UNKNOWN:
diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui
index c96b9034b..86ebfc6c4 100644
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@@ -708,7 +708,11 @@ p, li { white-space: pre-wrap; }
         <widget class="QComboBox" name="loadName" />
        </item>
        <item row="5" column="0" colspan="2" >
-        <widget class="QLineEdit" name="loadGPGPasswd" />
+        <widget class="QLineEdit" name="loadGPGPasswd" >
+         <property name="echoMode" >
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
        </item>
        <item row="4" column="0" >
         <widget class="QLabel" name="label_5" >
diff --git a/retroshare-gui/src/rsiface/rspeers.h b/retroshare-gui/src/rsiface/rspeers.h
index ae3976d5c..d8a9dd58c 100644
--- a/retroshare-gui/src/rsiface/rspeers.h
+++ b/retroshare-gui/src/rsiface/rspeers.h
@@ -83,6 +83,7 @@ class RsPeerDetails
 	std::list<std::string> signers;
 
 	uint32_t trustLvl;
+	uint32_t validLvl;
 
 	bool ownsign; /* we have signed certificate */
 	bool trusted; /* we trust their signature on others */