mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-02 05:02:33 -04:00
Turned RsInit into a static class, and changed retroshare invite so that it does not contain signatures anymore.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
b9abc24e5c
commit
78c07ca367
18 changed files with 589 additions and 464 deletions
|
@ -26,6 +26,7 @@
|
|||
|
||||
|
||||
#include "rsiface/rsiface.h" /* definition of iface */
|
||||
#include "rsiface/rsinit.h" /* definition of iface */
|
||||
|
||||
#include "notifytxt.h"
|
||||
|
||||
|
@ -69,15 +70,15 @@ int main(int argc, char **argv)
|
|||
* LoadPassword(...) set password for existing certificate.
|
||||
**/
|
||||
|
||||
RsInit *config = InitRsConfig();
|
||||
InitRetroShare(argc, argv, config);
|
||||
RsInit::InitRsConfig();
|
||||
RsInit::InitRetroShare(argc, argv);
|
||||
|
||||
/* load password should be called at this point: LoadPassword()
|
||||
* otherwise loaded from commandline.
|
||||
*/
|
||||
|
||||
/* Key + Certificate are loaded into libretroshare */
|
||||
LoadCertificates(config, false);
|
||||
RsInit::LoadCertificates(false);
|
||||
|
||||
/* Now setup the libretroshare interface objs
|
||||
* You will need to create you own NotifyXXX class
|
||||
|
@ -91,8 +92,9 @@ int main(int argc, char **argv)
|
|||
|
||||
/* Start-up libretroshare server threads */
|
||||
|
||||
rsServer -> StartupRetroShare(config);
|
||||
CleanupRsConfig(config);
|
||||
rsServer -> StartupRetroShare();
|
||||
RsInit::passwd = "" ;
|
||||
//CleanupRsConfig(config);
|
||||
|
||||
/* pass control to the GUI */
|
||||
while(1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue