ported trunk commit 2689,90,91,92 into branch

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-04-10 14:53:18 +00:00
parent 9f7e9517a6
commit 504d6654b2
13 changed files with 279 additions and 100 deletions

View file

@ -71,7 +71,7 @@ class RsInit
/* Login SSL */
static bool LoadPassword(std::string id, std::string passwd) ;
/* Final Certificate load. This can be called if:
/** Final Certificate load. This can be called if:
* a) InitRetroshare() returns true -> autoLoad/password Set.
* b) SelectGPGAccount() && LoadPassword()
*/
@ -83,6 +83,11 @@ class RsInit
static std::string RsProfileConfigDirectory();
static bool setStartMinimised() ;
static int getSslPwdLen();
static bool getAutoLogin();
static void setAutoLogin(bool autoLogin);
static bool RsClearAutoLogin() ;
private:
/* PreLogin */
@ -98,9 +103,10 @@ class RsInit
/* Auto Login */
static bool RsStoreAutoLogin() ;
static bool RsTryAutoLogin() ;
static bool RsClearAutoLogin() ;
};
#endif