From b3bedd592dcab1f9acd11c9bf06a72bc5996ddb5 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 6 Oct 2014 19:18:09 +0000 Subject: [PATCH] fixed display of channels with publish key git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7585 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp index c969d784c..468d431c5 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp @@ -284,12 +284,12 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point) if (shareKeyType()) { action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share"), this, SLOT(shareKey())); - action->setEnabled(!mGroupId.isNull() && isAdmin); + action->setEnabled(!mGroupId.isNull() && isPublisher); } - if (!mGroupId.isNull() && isPublisher && !isAdmin) { - contextMnu.addAction(QIcon(":/images/settings16.png"), tr("Restore Publish Rights" ), this, SLOT(restoreGroupKeys())); - } + //if (!mGroupId.isNull() && isPublisher && !isAdmin) { + // contextMnu.addAction(QIcon(":/images/settings16.png"), tr("Restore Publish Rights" ), this, SLOT(restoreGroupKeys())); + //} if (getLinkType() != RetroShareLink::TYPE_UNKNOWN) { action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyGroupLink())); @@ -656,7 +656,8 @@ void GxsGroupFrameDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupI //groupItemInfo.description = groupItemInfo.popularity = groupInfo.mPop; groupItemInfo.lastpost = QDateTime::fromTime_t(groupInfo.mLastPost); - groupItemInfo.subscribeFlags = groupInfo.mSubscribeFlags; + groupItemInfo.subscribeFlags = groupInfo.mSubscribeFlags; + groupItemInfo.privatekey = IS_GROUP_PUBLISHER(groupInfo.mSubscribeFlags) ; #if TOGXS if (groupInfo.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) {