From 78aacb927fe2e2d9805b520ac942025da534f47a Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 2 Feb 2011 22:38:56 +0000 Subject: [PATCH] Fixed compile of the changes in rsloginhandler on Windows. Fixed german language. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4009 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsserver/rsloginhandler.cc | 20 ++++++------------- retroshare-gui/src/gui/StartDialog.cpp | 4 ++-- retroshare-gui/src/lang/retroshare_de.qm | Bin 278243 -> 279612 bytes retroshare-gui/src/lang/retroshare_de.ts | 18 ++++++++++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc index 03b6763a6..4698db395 100644 --- a/libretroshare/src/rsserver/rsloginhandler.cc +++ b/libretroshare/src/rsserver/rsloginhandler.cc @@ -249,14 +249,9 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas #else /* try to load from file */ - std::string entropy = RsInitConfig::load_cert; + std::string entropy = getSSLPasswdFileName(ssl_id); /* get the data out */ - /* open the data to the file */ - std::string passwdfile = RsInitConfig::configDir; - passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator; - passwdfile += "help.dta"; - DATA_BLOB DataIn; DATA_BLOB DataEnt; DATA_BLOB DataOut; @@ -269,7 +264,8 @@ bool RsLoginHandler::tryAutoLogin(const std::string& ssl_id,std::string& ssl_pas char *dataptr = NULL; int datalen = 0; - FILE *fp = fopen(passwdfile.c_str(), "rb"); + /* open the data to the file */ + FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "rb"); if (fp != NULL) { fseek(fp, 0, SEEK_END); @@ -445,7 +441,7 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string #else /* windows */ /* store password encrypted in a file */ - std::string entropy = RsInitConfig::load_cert; + std::string entropy = getSSLPasswdFileName(ssl_id); DATA_BLOB DataIn; DATA_BLOB DataEnt; @@ -493,15 +489,11 @@ bool RsLoginHandler::enableAutoLogin(const std::string& ssl_id,const std::string std::cerr << std::endl; **********/ - /* save the data to the file */ - std::string passwdfile = RsInitConfig::configDir; - passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator; - passwdfile += "help.dta"; - //std::cerr << "Save to: " << passwdfile; //std::cerr << std::endl; - FILE *fp = fopen(passwdfile.c_str(), "wb"); + /* save the data to the file */ + FILE *fp = fopen(getAutologinFileName(ssl_id).c_str(), "wb"); if (fp != NULL) { fwrite(DataOut.pbData, 1, DataOut.cbData, fp); diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index cf580af06..5b2cc2ddf 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -211,9 +211,9 @@ void StartDialog::notSecureWarning() { /* some error msg */ if(ui.autologin_checkbox->isChecked()) #ifdef UBUNTU - QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); + QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); #else - QMessageBox::warning ( this, tr("Warning"), tr(" The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); + QMessageBox::warning ( this, tr("Warning"), tr("The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok); #endif return; diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index aba77a6a34cab996ac0c95f80b6785f11100fce7..0ba0fd737858c1f3a2d8b6e92cd1421f858fd448 100644 GIT binary patch delta 3495 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 boMxNn-|JkqG}@qN-ivIiRb}^RK={7_^pQS` delta 2452 zcmXBWdsxi*9tZHx@ALirnv0oYl1t^*WjNUeohB>Wuqay9?y`+ePQ~*mmXm$Z#k#eN zN*!7GB+ennqIM6;WtvLVI)_3kx#Y;MEESFmuT0GJJE?Bx0Zh6Qrx0{f$e8^~?peg*8koV$vf34pVJ^|z+S zx-#}wmY(J6%-&80kTd`gBonsCMp5RwYQy|VzJ@qjQNV6hvZ zFp0YaSVu2F#3jDca)1?cKv*jS47|m6BnSNRgRX!JKR638^n($A`BwlELoEt+u>)RO z1FT^)|J?*)@&OQHZ7tg3+EfrzR)WxG05L5ESm7_!jan@1q){wW`NR#xf_h+2!l{HM z+4od}_+SGF)xUuFt*a>gfZv=s=3g0El@B(oPYC;?ow{JMR860PTH?LS4N@ zW^w@OAYVi8Sdy$V@#RU%veIGA4yv;9!kUXFNtPtw^>|8?hvOX$waPO+D$C)s)KtK= zo$y)RQec(6FhBVY2p#bdF!db>O9w%~rgUc#(!0t9v$>1bqTR-maDg{;&MS(*~ z@#QR1Yqlt#JYbGxZop3eKzlW-v1>d@wn6r<=CVb-N?-+x+2WQ%01o+V<(?W~C(9|? zR)=jtlx6FO7tT|YZ8`qBk8+0^J-QdOe%cPg!(0(Pw*l*0D_V`!0s4F@%4TcY!c;mF~DwClHM-K{`|?_;T%sx`ETMzr#HZ~ffP0@3L7R+*|0cy+a zdAXj3m`XIzzqH8m*A3VoEd|6T1M56R zJ`R2hE)10-X9WZM!B2`xGWi&AN&OCqr9 zB5Bp}Ie;;%q*dizfUC{Ys%tBOopq*KhagRNy|iO~7_j?C25cKadPf7cR#PmeEuGAc zPwew+q@&S%A1{BGjx7%dcpD~V+wx&{BZJJN44RIu(uv)6fZxYSCmD~|dm~As5kaJLgYfV{@=cZIZ@m1w8YF+?|Zd z)BaXXQ!evZO`$ZW)tdW3GB&XhV4NTmw+#Z;{3EHI4fy7J3Um&#FBmDCKC=accSB{< ze`h@I?lQwIepPQdnVof5rKKk4D7?{5fi7Mickam&>gxd;_sLQ&d-La3E8Bgw8$iEM zmfklMgqz>W_7q(QbX_FN7|Pez@-vxTss z%}w%v{d{2e22riH0L=#|ZG4=jI9-1HhCkn8ll*x7*T9NDCc6nbr|LEG!cF|YzqZSZ zqI$WD2ka=47q4jGh5eBtCj{Z+CX;zWxPTS+$j(iNFPzBN?U3^JOhv#lUW2w9)an+l z?3t|yPq_`O)q#R1>Xe<)iglhPz^-d4ZDJI5x>5H;t@o>D#nJw5V6~ZwWB&;P*cE3{ zxVux4v%nLCA%_(ww%78kY*(Ckx(u+VK#@0an` zEwajWDqHamAEaG0$}P)UWr#!g-|k(t6i?p*lP#h#x8*s>6@`0Xh;?$D;W;`OTkHKg%k3joVcJ zUeDXTD9$2Io3A=9qyo#IN_)NhH1}?(&N=YQUmjMK%nb!*s-jk}(fCF~>Zu0IGg08w zQn#W=^@OMV7&r&&$>S6tM2t~;s4Dn-!bA0^BlG#_+o+zMTFhs0J?THramt;fPDqLY zA!(O7;oW6`U|02br-$>6nAC}WqXG91A!*tc>}sXNY5sI~S}^8)P43=Ce7=(sy$zUK zKxN)h_C%(k6Ouo~5@Z1sd`J@1=+o<~!16Ca%y^k+r z{qD5cClCLZNbZI>k6Yn3m!2}fjTdYxLl=S&vdyNZZVSK;Pn+8bIzAaQY-%4?^EgM? z)IVO!vtLBD2IKI?i8j5d3xTB=ZTgg-1Ek0D{(pa#zL_y>TgZ&$kQoC1U}4A%_S1=d OgWB1ZLRkmXFZ@4}Y+g_R diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index e9165465c..d890f79b9 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -10473,25 +10473,33 @@ Bist Du sicher? Warning - + Warnung - The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. + The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. Your PGP passwd will not be stored. This choice can be reverted in settings. - + Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in deinem Gnome Keyring gespeichert. + +Dein PGP wird nicht gespeichert. + +Du kannst die Auswahl in den Optionen zurücksetzen. - The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. + The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. Your PGP passwd will not be stored. This choice can be reverted in settings. - + Das Passwort deines SSL Zertifikates (deines Standortes) wird verschlüsselt in der Datei keys/help.dta gespeichert- Das ist nicht sicher. + +Dein PGP wird nicht gespeichert. + +Du kannst die Auswahl in den Optionen zurücksetzen.