Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 21:34:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added identity validation to GXS

Browse source 
Added id selection dialog to photo addition (a bit crude)
Better memory fix for memory exhaustion due to requests 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_sync-validate-fix@6089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-01-24 21:00:18 +00:00
parent 8d89d0bc95
commit 3f10cdead8
13 changed files with 232 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/gxs/gxssecurity.cc
View file

@ -162,6 +162,7 @@ bool GxsSecurity::validateNxsMsg(RsNxsMsg& msg, RsTlvKeySignature& sign, RsTlvSe
msgMeta.mOrigMsgId = origMsgId; msgMeta.mOrigMsgId = origMsgId;
msgMeta.mMsgId = msgId; msgMeta.mMsgId = msgId;
msgMeta.signSet = signSet;
if (signOk == 1) if (signOk == 1)
{ {

27
libretroshare/src/gxs/rsgenexchange.cc
View file

@ -101,20 +101,20 @@ void RsGenExchange::tick()
publishMsgs(); publishMsgs();
processGrpMetaChanges(); processGrpMetaChanges();
processMsgMetaChanges(); processMsgMetaChanges();
processRecvdData(); processRecvdData();
if(!mNotifications.empty()) if(!mNotifications.empty())
{ {
notifyChanges(mNotifications); notifyChanges(mNotifications);
mNotifications.clear(); mNotifications.clear();
} }
// implemented service tick function // implemented service tick function
service_tick(); service_tick();
} }
bool RsGenExchange::acknowledgeTokenMsg(const uint32_t& token, bool RsGenExchange::acknowledgeTokenMsg(const uint32_t& token,
@ -177,7 +177,7 @@ void RsGenExchange::generateGroupKeys(RsTlvSecurityKeySet& keySet, bool genPubli
adminKey.keyId = adminKey.keyId + "_public"; adminKey.keyId = adminKey.keyId + "_public";
adminKey.startTS = time(NULL); adminKey.startTS = time(NULL);
adminKey.endTS = 0; /* no end */ adminKey.endTS = adminKey.startTS + 60 * 60 * 24 * 365 * 5; /* approx 5 years */
privAdminKey.startTS = adminKey.startTS; privAdminKey.startTS = adminKey.startTS;
privAdminKey.endTS = 0; /* no end */ privAdminKey.endTS = 0; /* no end */
@ -434,7 +434,7 @@ bool RsGenExchange::createMsgSignatures(RsTlvKeySignatureSet& signSet, RsTlvBina
// poll immediately but, don't spend more than a second polling // poll immediately but, don't spend more than a second polling
while( (mGixs->getPrivateKey(msgMeta.mAuthorId, authorKey) == -1) && while( (mGixs->getPrivateKey(msgMeta.mAuthorId, authorKey) == -1) &&
((now + 1) >> time(NULL)) ((now + 5) > time(NULL))
) )
{ {
#ifndef WINDOWS_SYS #ifndef WINDOWS_SYS
@ -632,7 +632,6 @@ bool RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSec
{ {
valid = false; valid = false;
} }
} }
@ -664,7 +663,7 @@ bool RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSec
#endif #endif
} }
RsTlvKeySignature sign = metaData.signSet.keySignSet[GXS_SERV::FLAG_AUTHEN_PUBLISH]; RsTlvKeySignature sign = metaData.signSet.keySignSet[GXS_SERV::FLAG_AUTHEN_IDENTITY];
valid &= GxsSecurity::validateNxsMsg(*msg, sign, authorKey); valid &= GxsSecurity::validateNxsMsg(*msg, sign, authorKey);
}else }else
{ {

18
libretroshare/src/gxs/rsgxsifaceimpl.cc
View file

@ -52,7 +52,7 @@ void RsGxsIfaceImpl::groupsChanged(std::list<RsGxsGroupId> &grpIds)
} }
} }
bool RsGxsIfaceImpl::updated() bool RsGxsIfaceImpl::updated(bool willCallGrpChanged, bool willCallMsgChanged)
{ {
bool changed = false; bool changed = false;
{ {
@ -61,10 +61,18 @@ bool RsGxsIfaceImpl::updated()
changed = (!mGroupChange.empty() || !mMsgChange.empty()); changed = (!mGroupChange.empty() || !mMsgChange.empty());
} }
// std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs; if(!willCallGrpChanged)
// msgsChanged(msgs); {
// std::list<RsGxsGroupId> grpIds; std::list<RsGxsGroupId> grpIds;
// groupsChanged(grpIds); groupsChanged(grpIds);
}
if(!willCallMsgChanged)
{
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
msgsChanged(msgs);
}
return changed; return changed;
} }

14
libretroshare/src/gxs/rsgxsifaceimpl.h
View file

@ -59,9 +59,15 @@ public:
/*! /*!
* Checks to see if a change has been received for * Checks to see if a change has been received for
* for a message or group * for a message or group
* @param willCallGrpChanged if this is set to true, group changed function will return list
* groups that have changed, if false, the group changed list is cleared
* @param willCallMsgChanged if this is set to true, msgChanged function will return map
* messages that have changed, if false, the message changed map is cleared
* @return true if a change has occured for msg or group * @return true if a change has occured for msg or group
* @see groupsChanged
* @see msgsChanged
*/ */
virtual bool updated(); virtual bool updated(bool willCallGrpChanged = false, bool willCallMsgChanged = false);
/*! /*!
* The groups changed. \n * The groups changed. \n
@ -69,7 +75,8 @@ public:
* the group actually set for ui notification. * the group actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes * If receivedChanges is not passed RsGxsNotify changes
* this function does nothing * this function does nothing
* @param grpIds * @param grpIds returns list of grpIds that have changed
* @see updated
*/ */
virtual void groupsChanged(std::list<RsGxsGroupId>& grpIds); virtual void groupsChanged(std::list<RsGxsGroupId>& grpIds);
@ -79,7 +86,8 @@ public:
* the msg actually set for ui notification. * the msg actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes * If receivedChanges is not passed RsGxsNotify changes
* this function does nothing * this function does nothing
* @param msgs * @param msgs returns map of message ids that have changed
* @see updated
*/ */
virtual void msgsChanged(std::map<RsGxsGroupId, virtual void msgsChanged(std::map<RsGxsGroupId,
std::vector<RsGxsMessageId> >& msgs); std::vector<RsGxsMessageId> >& msgs);

5
libretroshare/src/gxs/rsgxsnetservice.cc
View file

@ -88,8 +88,7 @@ void RsGxsNetService::syncWithPeers()
sendItem(grp); sendItem(grp);
} }
//#ifdef GXS_ENABLE_SYNC_MSGS
#ifdef GXS_ENABLE_SYNC_MSGS
std::map<RsGxsGroupId, RsGxsGrpMetaData* > grpMeta; std::map<RsGxsGroupId, RsGxsGrpMetaData* > grpMeta;
mDataStore->retrieveGxsGrpMetaData(grpMeta); mDataStore->retrieveGxsGrpMetaData(grpMeta);
@ -127,7 +126,7 @@ void RsGxsNetService::syncWithPeers()
sendItem(msg); sendItem(msg);
} }
} }
#endif //#endif
} }
bool RsGxsNetService::loadList(std::list<RsItem*>& load) bool RsGxsNetService::loadList(std::list<RsItem*>& load)

7
libretroshare/src/rsserver/rsinit.cc
View file

@ -2280,7 +2280,6 @@ int RsServer::StartupRetroShare()
mPluginsManager->registerClientServices(pqih) ; mPluginsManager->registerClientServices(pqih) ;
mPluginsManager->registerCacheServices() ; mPluginsManager->registerCacheServices() ;
#ifdef RS_ENABLE_GXS #ifdef RS_ENABLE_GXS
// The idea is that if priorGxsDir is non // The idea is that if priorGxsDir is non
@ -2348,9 +2347,9 @@ int RsServer::StartupRetroShare()
RsGenExchange::RESTRICTED_GRP_BITS); RsGenExchange::RESTRICTED_GRP_BITS);
// Re-enable later, photo not using gixs yet // Re-enable later, photo not using gixs yet
// flag = GXS_SERV::MSG_AUTHEN_CHILD_AUTHOR_SIGN; flag = GXS_SERV::MSG_AUTHEN_ROOT_AUTHOR_SIGN; // should be GXS_SERV::MSG_AUTHEN_CHILD_AUTHOR_SIGN for comments
// RsGenExchange::setAuthenPolicyFlag(flag, photoAuthenPolicy, RsGenExchange::setAuthenPolicyFlag(flag, photoAuthenPolicy,
// RsGenExchange::RESTRICTED_GRP_BITS); RsGenExchange::RESTRICTED_GRP_BITS);
flag = GXS_SERV::GRP_OPTION_AUTHEN_AUTHOR_SIGN; flag = GXS_SERV::GRP_OPTION_AUTHEN_AUTHOR_SIGN;
RsGenExchange::setAuthenPolicyFlag(flag, photoAuthenPolicy, RsGenExchange::setAuthenPolicyFlag(flag, photoAuthenPolicy,

4
libretroshare/src/serialiser/rsnxsitems.cc
View file

@ -1106,9 +1106,9 @@ uint32_t RsNxsSerialiser::sizeNxsExtended(RsNxsExtended *item){
return 0; return 0;
} }
int RsNxsGrp::refcount = 0;
/** print and clear functions **/ /** print and clear functions **/
int RsNxsMsg::refcount = 0;
void RsNxsMsg::clear() void RsNxsMsg::clear()
{ {

27
libretroshare/src/serialiser/rsnxsitems.h
View file

@ -73,6 +73,7 @@ public:
setPriorityLevel(QOS_PRIORITY_RS_VOIP_PING); setPriorityLevel(QOS_PRIORITY_RS_VOIP_PING);
return; return;
} }
virtual ~RsNxsItem(){ return; }
virtual void clear() = 0; virtual void clear() = 0;
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0) = 0; virtual std::ostream &print(std::ostream &out, uint16_t indent = 0) = 0;
@ -188,14 +189,18 @@ class RsNxsGrp : public RsNxsItem
public: public:
RsNxsGrp(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP), grp(servtype), meta(servtype), RsNxsGrp(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_GRP), grp(servtype), meta(servtype),
metaData(NULL) { clear(); return; } metaData(NULL) { clear();
virtual ~RsNxsGrp() { if(metaData) delete metaData; } //std::cout << "\nGrp refcount++ : " << ++refcount << std::endl;
return; }
virtual ~RsNxsGrp() { if(metaData) delete metaData;
//std::cout << "\nGrp refcount-- : " << --refcount << std::endl;
}
virtual void clear(); virtual void clear();
virtual std::ostream &print(std::ostream &out, uint16_t indent); virtual std::ostream &print(std::ostream &out, uint16_t indent);
std::string grpId; /// group Id, needed to complete version Id (ncvi) std::string grpId; /// group Id, needed to complete version Id (ncvi)
static int refcount;
RsTlvBinaryData grp; /// actual group data RsTlvBinaryData grp; /// actual group data
/*! /*!
@ -263,15 +268,25 @@ class RsNxsMsg : public RsNxsItem
public: public:
RsNxsMsg(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_MSG), meta(servtype), msg(servtype), RsNxsMsg(uint16_t servtype) : RsNxsItem(servtype, RS_PKT_SUBTYPE_NXS_MSG), meta(servtype), msg(servtype),
metaData(NULL) { clear(); return; } metaData(NULL) {
~RsNxsMsg() { if(metaData) delete metaData; } // std::cout << "\nrefcount++ : " << ++refcount << std::endl;
clear(); return;
}
virtual ~RsNxsMsg()
{
//std::cout << "\nrefcount-- : " << --refcount << std::endl;
if(metaData){
//std::cout << "\ndeleted\n";
delete metaData;
}
}
virtual void clear(); virtual void clear();
virtual std::ostream &print(std::ostream &out, uint16_t indent); virtual std::ostream &print(std::ostream &out, uint16_t indent);
std::string grpId; /// group id, forms part of version id std::string grpId; /// group id, forms part of version id
std::string msgId; /// msg id std::string msgId; /// msg id
static int refcount;
/*! /*!
* This should contains all the data * This should contains all the data
* which is not specific to the Gxs service data * which is not specific to the Gxs service data

13
libretroshare/src/services/p3idservice.cc
View file

@ -691,21 +691,24 @@ bool p3IdService::cache_store(const RsGxsIdGroupItem *item)
for (kit = keySet.keys.begin(); kit != keySet.keys.end(); kit++) for (kit = keySet.keys.begin(); kit != keySet.keys.end(); kit++)
{ {
if (kit->second.keyFlags | RSTLV_KEY_DISTRIB_ADMIN) if (kit->second.keyFlags & RSTLV_KEY_DISTRIB_ADMIN)
{ {
std::cerr << "p3IdService::cache_store() Found Admin Key"; std::cerr << "p3IdService::cache_store() Found Admin Key";
std::cerr << std::endl; std::cerr << std::endl;
/* save full key - if we have it */ /* save full key - if we have it */
if (kit->second.keyFlags | RSTLV_KEY_TYPE_FULL) if (kit->second.keyFlags & RSTLV_KEY_TYPE_FULL)
{ {
fullkey = kit->second; fullkey = kit->second;
full_key_ok = true; full_key_ok = true;
} }
/* cache public key always */ if (kit->second.keyFlags & RSTLV_KEY_TYPE_PUBLIC_ONLY)
pubkey = kit->second; {
pub_key_ok = true; /* cache public key always */
pubkey = kit->second;
pub_key_ok = true;
}
} }
} }

26
libretroshare/src/services/p3posted.cc
View file

@ -68,18 +68,18 @@ void p3Posted::service_tick()
generatePosts(); generatePosts();
generateVotesAndComments(); generateVotesAndComments();
time_t now = time(NULL); // time_t now = time(NULL);
//
if((now > (time_t) (VOTE_UPDATE_PERIOD + mLastUpdate)) && // if((now > (time_t) (VOTE_UPDATE_PERIOD + mLastUpdate)) &&
(mUpdatePhase == UPDATE_PHASE_GRP_REQUEST)) // (mUpdatePhase == UPDATE_PHASE_GRP_REQUEST))
{ // {
mPostUpdate = true; // mPostUpdate = true;
mLastUpdate = time(NULL); // mLastUpdate = time(NULL);
} // }
//
updateVotes(); // updateVotes();
//
processRankings(); // processRankings();
} }
void p3Posted::generateVotesAndComments() void p3Posted::generateVotesAndComments()
@ -505,7 +505,6 @@ bool p3Posted::requestPostRankings(uint32_t &token, const RankType &rType, const
gp->pubToken = token; gp->pubToken = token;
gp->rankingResult.rType = gp->rType; gp->rankingResult.rType = gp->rType;
gp->rankingResult.grpId = gp->grpId; gp->rankingResult.grpId = gp->grpId;
gp->grpId = gp->grpId;
mPendingPostRanks.push_back(gp); mPendingPostRanks.push_back(gp);
@ -768,6 +767,7 @@ bool p3Posted::completePostedPostCalc(GxsPostedPostRanking *gpp)
break; break;
default: default:
std::cerr << "Unknown ranking tpye: " << gpp->rType << std::endl; std::cerr << "Unknown ranking tpye: " << gpp->rType << std::endl;
break;
} }
return true; return true;
}else }else

13
retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
View file

@ -24,6 +24,8 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const RsPhotoPhoto &photo, QW
ui->lineEdit_PhotoGrapher->setVisible(false); ui->lineEdit_PhotoGrapher->setVisible(false);
setUp(); setUp();
ui->idChooser->setVisible(false);
} }
PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget *parent) : PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget *parent) :
@ -43,6 +45,8 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, QWidget
connect(ui->lineEdit_Title, SIGNAL(editingFinished()), this, SLOT(setTitle())); connect(ui->lineEdit_Title, SIGNAL(editingFinished()), this, SLOT(setTitle()));
connect(ui->lineEdit_PhotoGrapher, SIGNAL(editingFinished()), this, SLOT(setPhotoGrapher())); connect(ui->lineEdit_PhotoGrapher, SIGNAL(editingFinished()), this, SLOT(setPhotoGrapher()));
ui->idChooser->loadIds(0, "");
} }
void PhotoItem::setSelected(bool selected) void PhotoItem::setSelected(bool selected)
@ -101,6 +105,15 @@ void PhotoItem::setPhotoGrapher()
const RsPhotoPhoto& PhotoItem::getPhotoDetails() const RsPhotoPhoto& PhotoItem::getPhotoDetails()
{ {
if(ui->idChooser->isVisible())
{
RsGxsId id;
ui->idChooser->getChosenId(id);
mPhotoDetails.mMeta.mAuthorId = id;
}
return mPhotoDetails; return mPhotoDetails;
} }

241
retroshare-gui/src/gui/PhotoShare/PhotoItem.ui
View file

@ -1,110 +1,131 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PhotoItem</class> <class>PhotoItem</class>
<widget class="QWidget" name="PhotoItem"> <widget class="QWidget" name="PhotoItem">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>253</width> <width>253</width>
<height>233</height> <height>233</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QFrame" name="photoFrame"> <widget class="QFrame" name="photoFrame">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QFrame#photoFrame{border: 2px solid #CCCCCC; <string notr="true">QFrame#photoFrame{border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #EEEEEE, stop: 1 #CCCCCC); stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}</string> border-radius: 10px}</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QLabel" name="label_Thumbnail"> <widget class="QLabel" name="label_Thumbnail">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>TextLabel</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QLabel" name="AlbumTitle"> <widget class="QLabel" name="AlbumTitle">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Photo Title :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Photo Title :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Photographer :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Photographer :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QLabel" name="identity">
<item> <property name="text">
<layout class="QVBoxLayout" name="editLayOut"> <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<item> &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
<widget class="QLineEdit" name="lineEdit_Title"> p, li { white-space: pre-wrap; }
<property name="text"> &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
<string/> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Author :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QLineEdit" name="lineEdit_PhotoGrapher"/> </item>
</item> <item>
</layout> <layout class="QVBoxLayout" name="editLayOut">
</item> <item>
</layout> <widget class="QLineEdit" name="lineEdit_Title">
</item> <property name="text">
</layout> <string/>
</item> </property>
<item> </widget>
<spacer name="verticalSpacer"> </item>
<property name="orientation"> <item>
<enum>Qt::Vertical</enum> <widget class="QLineEdit" name="lineEdit_PhotoGrapher"/>
</property> </item>
<property name="sizeHint" stdset="0"> <item>
<size> <widget class="GxsIdChooser" name="idChooser"/>
<width>20</width> </item>
<height>40</height> </layout>
</size> </item>
</property> </layout>
</spacer> </item>
</item> </layout>
</layout> </item>
</widget> <item>
</item> <spacer name="verticalSpacer">
</layout> <property name="orientation">
</widget> <enum>Qt::Vertical</enum>
<resources/> </property>
<connections/> <property name="sizeHint" stdset="0">
</ui> <size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>GxsIdChooser</class>
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

2
retroshare-gui/src/gui/Posted/PostedListDialog.cpp
View file

@ -223,7 +223,7 @@ void PostedListDialog::updateDisplay()
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs; std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
if (rsPosted->updated()) if (rsPosted->updated(true, true))
{ {
/* update Forums List */ /* update Forums List */