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

Merge pull request #924 from PhenomRetroShare/Fix_retroshare06_case

Browse source 
Change RetroShare06 to lower case
This commit is contained in:
csoler 2017-07-19 18:26:32 +02:00 • committed by GitHub
commit 0d681b149f
80 changed files with 212 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/settings/GeneralPage.ui
View file

@ -165,7 +165,7 @@
</font>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare06.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>!!!The RetroShare's desktop file is missing or wrong!!!</string>

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

@ -799,9 +799,9 @@ bool RshareSettings::getRetroShareProtocol()
}
}
#elif defined(Q_OS_LINUX)
QFile desktop("/usr/share/applications/retroshare06.desktop");
QFile desktop("/usr/share/applications/retroshare.desktop");
if (!desktop.exists()) {
desktop.setFileName("/usr/share/applications/RetroShare06.desktop");
desktop.setFileName("/usr/share/applications/retroshare.desktop");
}
if (desktop.exists()) {
desktop.open(QIODevice::ReadOnly | QIODevice::Text);