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

fixed compilaiton of photoshare due to changes in GxsChange class

Browse Source
This commit is contained in:
csoler 2020-05-21 22:45:49 +02:00
parent 1f5ac32a81
commit 82690561b6
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
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()) while(!mGroupChange.empty())
{ {
RsGxsGroupChange* gc = mGroupChange.back(); RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->mGrpIdList; grpIds.push_back(gc->mGroupId);
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); ++lit) {
grpIds.push_back(*lit);
}
mGroupChange.pop_back(); mGroupChange.pop_back();
delete gc; delete gc;
@ -136,7 +132,8 @@ void p3PhotoService::msgsChanged(GxsMsgIdResult& msgs)
while(!mMsgChange.empty()) while(!mMsgChange.empty())
{ {
RsGxsMsgChange* mc = mMsgChange.back(); RsGxsMsgChange* mc = mMsgChange.back();
msgs = mc->msgChangeMap;
msgs[mc->mGroupId].insert(mc->mMsgId);
mMsgChange.pop_back(); mMsgChange.pop_back();
delete mc; delete mc;
} }

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

@ -129,7 +129,7 @@ void GxsCircleItem::setup()
{ {
if(circleDetails.mAmIAdmin) 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->setHidden(false);
ui->inviteeButton->setText(tr("Revoke membership")); ui->inviteeButton->setText(tr("Revoke membership"));
ui->inviteeButton->setToolTip(tr("Revoke membership for that identity")); ui->inviteeButton->setToolTip(tr("Revoke membership for that identity"));
@ -137,7 +137,7 @@ void GxsCircleItem::setup()
else else
{ {
ui->inviteeButton->setHidden(true); 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); ui->iconLabel->setPixmap(pixmap);