diff --git a/libretroshare/src/gxstrans/p3gxstrans.h b/libretroshare/src/gxstrans/p3gxstrans.h index 688a9cd22..aff7b9eda 100644 --- a/libretroshare/src/gxstrans/p3gxstrans.h +++ b/libretroshare/src/gxstrans/p3gxstrans.h @@ -272,8 +272,7 @@ private: { if(mPreferredGroupId < potentialGrId) { - std::cerr << "supersedePreferredGroup(...) " << potentialGrId - << " supersed " << mPreferredGroupId << std::endl; + // std::cerr << "supersedePreferredGroup(...) " << potentialGrId << " supersed " << mPreferredGroupId << std::endl; mPreferredGroupId = potentialGrId; return true; } diff --git a/libretroshare/src/services/p3gxscircles.cc b/libretroshare/src/services/p3gxscircles.cc index f1f39a792..0b7bc9570 100644 --- a/libretroshare/src/services/p3gxscircles.cc +++ b/libretroshare/src/services/p3gxscircles.cc @@ -1781,7 +1781,7 @@ rstime_t p3GxsCircles::service_getLastGroupSeenTs(const RsGxsGroupId& gid) } bool p3GxsCircles::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) { -#ifdef GXSFORUMS_CHANNELS +#ifdef GXSFORUMS_CIRCLES std::cerr << "p3gxsChannels: Checking unused circles: called by GxsCleaning." << std::endl; #endif @@ -1794,7 +1794,7 @@ bool p3GxsCircles::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) auto it = mKnownCircles.find(meta.mGroupId); bool unknown_posted = (it == mKnownCircles.end()); -#ifdef GXSFORUMS_CHANNELS +#ifdef GXSFORUMS_CIRCLES std::cerr << " Circle " << meta.mGroupId ; #endif @@ -1803,7 +1803,7 @@ bool p3GxsCircles::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) // This case should normally not happen. It does because this board was never registered since it may // arrived before this code was here -#ifdef GXSFORUMS_CHANNELS +#ifdef GXSFORUMS_CIRCLES std::cerr << ". Not known yet. Adding current time as new TS." << std::endl; #endif mKnownCircles[meta.mGroupId] = now; @@ -1816,18 +1816,20 @@ bool p3GxsCircles::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) bool used_by_friends = (now < it->second + CIRCLES_UNUSED_BY_FRIENDS_DELAY); bool subscribed = static_cast(meta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED); +#ifdef GXSFORUMS_CIRCLES std::cerr << ". subscribed: " << subscribed << ", used_by_friends: " << used_by_friends << " last TS: " << now - it->second << " secs ago (" << (now-it->second)/86400 << " days)"; +#endif if(!subscribed && !used_by_friends) { -#ifdef GXSFORUMS_CHANNELS +#ifdef GXSFORUMS_CIRCLES std::cerr << ". Scheduling for deletion" << std::endl; #endif return false; } else { -#ifdef GXSFORUMS_CHANNELS +#ifdef GXSFORUMS_CIRCLES std::cerr << ". Keeping!" << std::endl; #endif return true; diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp index 96180b874..cd2bd988e 100644 --- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp +++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp @@ -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(); diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp index 7d869ab57..76622625b 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp @@ -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