Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1963 from csoler/v0.6-GxsGroup

Browse Source 
fixed compilaiton of photoshare due to changes in GxsChange class
This commit is contained in:
csoler 2020-05-22 18:21:33 +02:00 committed by GitHub
commit eeca7c6d3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/services/p3photoservice.cc
View File

@ -117,11 +117,7 @@ void p3PhotoService::groupsChanged(std::list<RsGxsGroupId>& grpIds)
while(!mGroupChange.empty())
{
RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->mGrpIdList;
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); ++lit) {
grpIds.push_back(*lit);
}
grpIds.push_back(gc->mGroupId);
mGroupChange.pop_back();
delete gc;
@ -136,7 +132,8 @@ void p3PhotoService::msgsChanged(GxsMsgIdResult& msgs)
while(!mMsgChange.empty())
{
RsGxsMsgChange* mc = mMsgChange.back();
msgs = mc->msgChangeMap;
msgs[mc->mGroupId].insert(mc->mMsgId);
mMsgChange.pop_back();
delete mc;
}

4
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
View File

@ -129,7 +129,7 @@ void GxsCircleItem::setup()
{
if(circleDetails.mAmIAdmin)
{
ui->titleLabel->setText(idName + tr(" which you invited, has join this circle you're administrating."));
ui->titleLabel->setText(idName + tr(" which you invited, has joined this circle you're administrating."));
ui->inviteeButton->setHidden(false);
ui->inviteeButton->setText(tr("Revoke membership"));
ui->inviteeButton->setToolTip(tr("Revoke membership for that identity"));
@ -137,7 +137,7 @@ void GxsCircleItem::setup()
else
{
ui->inviteeButton->setHidden(true);
ui->titleLabel->setText(idName + tr(" has join this circle."));
ui->titleLabel->setText(idName + tr(" has joined this circle."));
}
ui->iconLabel->setPixmap(pixmap);