Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-11 10:35:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

20
retroshare-gui/src/main.cpp
View file

@ -19,14 +19,14 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#error "******************************************************************************************************************"
#error "**** Retroshare trunk/ is currently being merged to v0.6 and protocols are not stable. It is unlikely that *****"
#error "**** you want to compile the trunk now. *****"
#error "**** *****"
#error "**** To compile the latest Retroshare 0.5.5, please go to branches/v0.5.5 *****"
#error "**** *****"
#error "**** --- The dev team --- *****"
#error "******************************************************************************************************************"
//#error "******************************************************************************************************************"
//#error "**** Retroshare trunk/ is currently being merged to v0.6 and protocols are not stable. It is unlikely that *****"
//#error "**** you want to compile the trunk now. *****"
//#error "**** *****"
//#error "**** To compile the latest Retroshare 0.5.5, please go to branches/v0.5.5 *****"
//#error "**** *****"
//#error "**** --- The dev team --- *****"
//#error "******************************************************************************************************************"
#include <QObject>
#include <QMessageBox>
@ -264,7 +264,7 @@ int main(int argc, char *argv[])
/* Login Dialog */
/* check for existing Certificate */
bool genCert = false;
std::list<std::string> accountIds;
std::list<RsPeerId> accountIds;
if (RsAccounts::GetAccountIds(accountIds) && (accountIds.size() > 0))
{
StartDialog sd;
@ -296,7 +296,7 @@ int main(int argc, char *argv[])
splashScreen.show();
splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
std::string preferredId;
RsPeerId preferredId;
RsAccounts::GetPreferredAccountId(preferredId);
// true: note auto-login is active