Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-16 00:53:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1904 from sehraf/pr_two_fixes

Browse source 
Two small fixes.
This commit is contained in:
defnax 2020-05-05 00:39:23 +02:00 • committed by GitHub
commit 95497d5f33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/retroshare/rsgxschannels.h
View file

@ -337,9 +337,9 @@ public:
* @brief Get channel comments corresponding to the given IDs. * @brief Get channel comments corresponding to the given IDs.
* If the set is empty, nothing is returned. * If the set is empty, nothing is returned.
* @jsonapi{development} * @jsonapi{development}
* @param channelId id of the channel of which the content is requested * @param[in] channelId id of the channel of which the content is requested
* @param contentIds ids of requested contents * @param[in] contentIds ids of requested contents
* @param comments storage for the comments * @param[out] comments storage for the comments
* @return false if something failed, true otherwhise * @return false if something failed, true otherwhise
*/ */
virtual bool getChannelComments(const RsGxsGroupId &channelId, virtual bool getChannelComments(const RsGxsGroupId &channelId,

5
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -91,8 +91,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
ui.tabWidget->removeTab(TAB_RELAYS) ; // remove relays. Not useful in Tor mode. ui.tabWidget->removeTab(TAB_RELAYS) ; // remove relays. Not useful in Tor mode.
ui.tabWidget->removeTab(TAB_IP_FILTERS) ; // remove IP filters. Not useful in Tor mode. ui.tabWidget->removeTab(TAB_IP_FILTERS) ; // remove IP filters. Not useful in Tor mode.
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB) ; // remove the Automatic I2P/BOB tab
ui.hiddenpage_proxyAddress_i2p->hide() ; ui.hiddenpage_proxyAddress_i2p->hide() ;
ui.hiddenpage_proxyLabel_i2p->hide() ; ui.hiddenpage_proxyLabel_i2p->hide() ;
ui.hiddenpage_proxyPort_i2p->hide() ; ui.hiddenpage_proxyPort_i2p->hide() ;
@ -109,8 +107,7 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
} }
else else
{ {
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_I2P_BOB); // warning: the order of operation here is very important. ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_INCOMING); // warning: the order of operation here is very important.
ui.hiddenServiceTab->removeTab(TAB_HIDDEN_SERVICE_INCOMING);
} }
ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_RANGE,new QTableWidgetItem(tr("IP Range"))) ; ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_RANGE,new QTableWidgetItem(tr("IP Range"))) ;