Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 00:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2378 from csoler/v0.6-BugFixing_10

Browse source 
Last fixes (removed debug log) before release
This commit is contained in:
csoler 2021-03-13 22:54:52 +01:00 • committed by GitHub
commit 751fffc30f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View file

@ -161,7 +161,11 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name)
// case 4: otherwise, do not display
std::cerr << "TEXTBROWSER: refusing load ressource request: type=" << type << " scheme=" << name.scheme().toStdString() << ", url=" << name.toString().toStdString() << std::endl;
std::cerr << "TEXTBROWSER: refusing load ressource request: type=" << type << " scheme="
<< name.scheme().toStdString() << ", url="
<< name.toString().left(50).toStdString()
<< ((name.toString().length()>50)?"...":"")
<< std::endl;
if (mImageBlockWidget)
mImageBlockWidget->show();

4
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View file

@ -96,14 +96,18 @@ void RSPermissionMatrixWidget::updateDisplay()
void RSPermissionMatrixWidget::mousePressEvent(QMouseEvent *e)
{
#ifdef DEBUG_PERMISSION_MATRIX
std::cerr << "mouse pressed at x=" << e->x() << ", y=" << e->y() << std::endl;
#endif
uint32_t service_id ;
RsPeerId peer_id ;
if(computeServiceAndPeer(e->x(),e->y(),service_id,peer_id))
{
#ifdef DEBUG_PERMISSION_MATRIX
std::cerr << "Peer id: " << peer_id << ", service: " << service_id << std::endl;
#endif
// Make sure the service is not globally disabled