fixed compilation of circles

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -1625,7 +1625,8 @@ void RsGxsNetService::locked_processCompletedIncomingTrans(NxsTransaction* tr)
             IndicateConfigChanged();
 
 
-        }else if(flag & RsNxsTransac::FLAG_TYPE_MSGS)
+        }
+        else if(flag & RsNxsTransac::FLAG_TYPE_MSGS)
         {
 
             std::vector<RsNxsMsg*> msgs;

retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp

@@ -309,31 +309,52 @@ void CreateCircleDialog::createCircle()
 	/* copy Ids from GUI */
 	QTreeWidget *tree = ui.treeWidget_membership;
 	int count = tree->topLevelItemCount();
-	for(int i = 0; i < count; ++i) {
+	for(int i = 0; i < count; ++i)  
+    {
 	    QTreeWidgetItem *item = tree->topLevelItem(i);
 	    QString keyId = item->text(RSCIRCLEID_COL_KEYID);
 
 	    /* insert into circle */
-		if (mIsExternalCircle) {
+	    if (mIsExternalCircle) 
-            circle.mInvitedMembers.push_back(RsGxsId(keyId.toStdString()));
+	    {
+		    RsGxsId key_id_gxs(keyId.toStdString()) ;
+
+		    if(key_id_gxs.isNull())
+		    {
+			    std::cerr << "Error: Not a proper keyID: " << keyId.toStdString() << std::endl;
+			    continue ;
+		    } 
+
+		    circle.mInvitedMembers.insert(key_id_gxs) ;
 		    std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
 		    std::cerr << std::endl;
-		} else {//if (mIsExternalCircle)
+	    } 
-			circle.mLocalFriends.push_back(RsPgpId(keyId.toStdString()));	
+	    else 
+	    {
+		    RsPgpId key_id_pgp(keyId.toStdString()) ;
+
+		    if(key_id_pgp.isNull())
+		    {
+			    std::cerr << "Error: Not a proper PGP keyID: " << keyId.toStdString() << std::endl;
+			    continue ;
+		    } 
+
+		    circle.mLocalFriends.insert(key_id_pgp) ;
 		    std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
 		    std::cerr << std::endl;
-		}//else (mIsExternalCircle)
+	    }
 
-	}//for(int i = 0; i < count; ++i)
+    }
 
-	if (mIsExistingCircle) {
+	if (mIsExistingCircle) 
+    {
 		std::cerr << "CreateCircleDialog::createCircle() Existing Circle TODO";
 		std::cerr << std::endl;
 
 		// cannot edit these yet.
 		QMessageBox::warning(this, tr("RetroShare"),tr("Cannot Edit Existing Circles Yet"), QMessageBox::Ok, QMessageBox::Ok);
 		return; 
-	}//if (mIsExistingCircle)
+	}
 
 	if (mIsExternalCircle) {
 		std::cerr << "CreateCircleDialog::createCircle() External Circle";
@@ -410,12 +431,14 @@ void CreateCircleDialog::updateCircleGUI()
 	std::cerr << std::endl;
 
 	switch(mCircleGroup.mMeta.mCircleType) {
+#ifdef RS_ALLOW_LOCAL_CIRCLES
 		case GXS_CIRCLE_TYPE_LOCAL:
 			std::cerr << "CreateCircleDialog::updateCircleGUI() : LOCAL CIRCLETYPE";
 			std::cerr << std::endl;
 
 			isExternal = false;
 			break;
+#endif
 
 		case GXS_CIRCLE_TYPE_PUBLIC:
 			std::cerr << "CreateCircleDialog::updateCircleGUI() : PUBLIC CIRCLETYPE";
@@ -527,16 +550,10 @@ void CreateCircleDialog::getPgpIdentities()
 		tree->addTopLevelItem(item);
 
 		// Local Circle.
-		if (mIsExistingCircle) {
+		if (mIsExistingCircle) 
-			// check if its in the circle.
+			if ( mCircleGroup.mLocalFriends.find(details.gpg_id) != mCircleGroup.mLocalFriends.end())  // check if its in the circle.
-			std::list<RsPgpId>::const_iterator it;
-			it = std::find(mCircleGroup.mLocalFriends.begin(), mCircleGroup.mLocalFriends.end(), details.gpg_id);
-			if (it != mCircleGroup.mLocalFriends.end()) {
-				/* found it */
 				addMember(keyId, idtype, nickname);
-			}//if (it != mCircleGroup.mLocalFriends.end())
+	}
-		}//if (mIsExistingCircle)
-	}//for(it = ids.begin(); it != ids.end(); ++it)
 	
 	filterIds();
 }
@@ -576,7 +593,8 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
 		return;
 	}//if (!rsIdentity->getGroupData(token, datavector))
 
-	for(vit = datavector.begin(); vit != datavector.end(); ++vit) {
+    for(vit = datavector.begin(); vit != datavector.end(); ++vit) 
+    {
 	    data = (*vit);
 
 	    /* do filtering */
@@ -616,20 +634,17 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
 	    tree->addTopLevelItem(item);
 
 	    // External Circle.
-		if (mIsExistingCircle) {
+	    if (mIsExistingCircle) 
+	    {
 		    // check if its in the circle.
-			std::list<RsGxsId>::const_iterator it;
 
 		    // We use an explicit cast
 		    //
-			it = std::find(mCircleGroup.mInvitedMembers.begin(), mCircleGroup.mInvitedMembers.end(), RsGxsId(data.mMeta.mGroupId));
 
-			if (it != mCircleGroup.mInvitedMembers.end()) {
+		    if ( mCircleGroup.mInvitedMembers.find(RsGxsId(data.mMeta.mGroupId)) != mCircleGroup.mInvitedMembers.end())  /* found it */
-				/* found it */
 			    addMember(keyId, idtype, nickname);
-			}//if (it != mCircleGroup.mInvitedMembers.end())
+	    }
-		}//if (mIsExistingCircle)
+    }
-	}//for(vit = datavector.begin(); vit != datavector.end(); ++vit)
 }
 
 void CreateCircleDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
@@ -683,5 +698,5 @@ void  CreateCircleDialog::createNewGxsId()
 	IdEditDialog dlg(this);
 	dlg.setupNewId(false);
 	dlg.exec();
-	ui.idChooser->setDefaultId(dlg.getLastIdName());
+	//ui.idChooser->setDefaultId(dlg.getLastIdName());
 }

retroshare-gui/src/gui/People/IdentityWidget.cpp

@@ -122,15 +122,14 @@ void IdentityWidget::updateData(const RsPeerDetails &pgp_details)
     ui->labelKeyId->setToolTip(tr("PGP id:").append(" "+_keyId));
 
     QPixmap avatar;
-		AvatarDefs::getAvatarFromGpgId(_details.gpg_id.toStdString(), avatar);
+    AvatarDefs::getAvatarFromGpgId(_details.gpg_id, avatar);
-		if (_avatar != avatar.toImage()) {
+    if (_avatar != avatar.toImage()) 
+    {
 	    _avatar = avatar.toImage();
 	    _scene->clear();
 	    _scene->addPixmap(avatar.scaled(ui->graphicsView->width(),ui->graphicsView->height()));
 	    emit imageUpdated();
-		}//if (_avatar != avatar.toImage())
+    }
-
-	//}//if (_details != gpg_details)
 }
 
 void IdentityWidget::updateData(const RsGxsIdGroup &gxs_group_info, const RsPeerDetails &pgp_details)

retroshare-gui/src/retroshare-gui.pro

@@ -31,8 +31,9 @@ CONFIG += gxsgui
 
 DEFINES += RS_ENABLE_GXS
 
-unfinished {
 	CONFIG += gxscircles
+
+unfinished {
 	CONFIG += gxsthewire
 	CONFIG += gxsphotoshare
 	CONFIG += wikipoos