From 82690561b6e22d288426867091a7531843c396aa Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 21 May 2020 22:45:49 +0200
Subject: [PATCH] fixed compilaiton of photoshare due to changes in GxsChange
class
---
libretroshare/src/services/p3photoservice.cc | 9 +++------
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/libretroshare/src/services/p3photoservice.cc b/libretroshare/src/services/p3photoservice.cc
index 014c0d319..1547e5a7d 100644
--- a/libretroshare/src/services/p3photoservice.cc
+++ b/libretroshare/src/services/p3photoservice.cc
@@ -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;
}
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
index 8c355de35..18997a084 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
@@ -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);