From 4e0ee29d6a68ebe9ebd5b79cd7c1bdd516016c24 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 17 Mar 2016 20:18:54 -0400 Subject: [PATCH] fixed creation/distribution of self-restricted circles --- .../src/gui/Circles/CreateCircleDialog.cpp | 23 +++++++++++-------- .../src/util/RsGxsUpdateBroadcast.cpp | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index da275f910..f1fa5456e 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -167,10 +167,10 @@ void CreateCircleDialog::updateCircleType(bool b) if(!b) return ; // no need to change when b<-false - if(ui.radioButton_Self->isChecked()) - setupForPersonalCircle() ; - else - setupForExternalCircle() ; + //if(ui.radioButton_Self->isChecked()) + // setupForPersonalCircle() ; + //else + setupForExternalCircle() ; if(ui.radioButton_Restricted->isChecked()) { @@ -509,6 +509,10 @@ void CreateCircleDialog::updateCircleGUI() std::cerr << "CreateCircleDialog::updateCircleGUI() : CIRCLETYPE: " << mCircleGroup.mMeta.mCircleType; std::cerr << std::endl; + ui.radioButton_Public->setChecked(false); + ui.radioButton_Self->setChecked(false); + ui.radioButton_Restricted->setChecked(false); + switch(mCircleGroup.mMeta.mCircleType) { #ifdef RS_ALLOW_LOCAL_CIRCLES case GXS_CIRCLE_TYPE_LOCAL: @@ -527,15 +531,14 @@ void CreateCircleDialog::updateCircleGUI() break; case GXS_CIRCLE_TYPE_EXT_SELF: - std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"; - std::cerr << std::endl; + std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"<< std::endl; case GXS_CIRCLE_TYPE_EXTERNAL: - std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"; - std::cerr << std::endl; + std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"<< std::endl; - if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString()) { + if (RsGxsGroupId(mCircleGroup.mMeta.mCircleId) == mCircleGroup.mMeta.mGroupId) + ui.radioButton_Self->setChecked(true); + else ui.radioButton_Restricted->setChecked(true); - }//if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString()) ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mCircleGroup.mMeta.mCircleId); diff --git a/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp b/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp index 947e85f14..dd891cd58 100644 --- a/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp +++ b/retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp @@ -59,7 +59,7 @@ void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes) } if(changes.mService != mIfaceImpl->getTokenService()) { - std::cerr << "(EE) Incorrect service. Dropping." << std::endl; + // std::cerr << "(EE) Incorrect service. Dropping." << std::endl; return; }