Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-28 08:54:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed creation/distribution of self-restricted circles

Browse source
This commit is contained in:
csoler 2016-03-17 20:18:54 -04:00
parent b6388d7a7a
commit 4e0ee29d6a
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -167,9 +167,9 @@ void CreateCircleDialog::updateCircleType(bool b)
if(!b) if(!b)
return ; // no need to change when b<-false return ; // no need to change when b<-false
if(ui.radioButton_Self->isChecked()) //if(ui.radioButton_Self->isChecked())
setupForPersonalCircle() ; // setupForPersonalCircle() ;
else //else
setupForExternalCircle() ; setupForExternalCircle() ;
if(ui.radioButton_Restricted->isChecked()) if(ui.radioButton_Restricted->isChecked())
@ -509,6 +509,10 @@ void CreateCircleDialog::updateCircleGUI()
std::cerr << "CreateCircleDialog::updateCircleGUI() : CIRCLETYPE: " << mCircleGroup.mMeta.mCircleType; std::cerr << "CreateCircleDialog::updateCircleGUI() : CIRCLETYPE: " << mCircleGroup.mMeta.mCircleType;
std::cerr << std::endl; std::cerr << std::endl;
ui.radioButton_Public->setChecked(false);
ui.radioButton_Self->setChecked(false);
ui.radioButton_Restricted->setChecked(false);
switch(mCircleGroup.mMeta.mCircleType) { switch(mCircleGroup.mMeta.mCircleType) {
#ifdef RS_ALLOW_LOCAL_CIRCLES #ifdef RS_ALLOW_LOCAL_CIRCLES
case GXS_CIRCLE_TYPE_LOCAL: case GXS_CIRCLE_TYPE_LOCAL:
@ -527,15 +531,14 @@ void CreateCircleDialog::updateCircleGUI()
break; break;
case GXS_CIRCLE_TYPE_EXT_SELF: case GXS_CIRCLE_TYPE_EXT_SELF:
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"; std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"<< std::endl;
std::cerr << std::endl;
case GXS_CIRCLE_TYPE_EXTERNAL: case GXS_CIRCLE_TYPE_EXTERNAL:
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"; std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"<< std::endl;
std::cerr << 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); ui.radioButton_Restricted->setChecked(true);
}//if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString())
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mCircleGroup.mMeta.mCircleId); ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mCircleGroup.mMeta.mCircleId);

2
retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp
View file

@ -59,7 +59,7 @@ void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes)
} }
if(changes.mService != mIfaceImpl->getTokenService()) if(changes.mService != mIfaceImpl->getTokenService())
{ {
std::cerr << "(EE) Incorrect service. Dropping." << std::endl; // std::cerr << "(EE) Incorrect service. Dropping." << std::endl;
return; return;
} }