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

Merge pull request #1934 from PhenomRetroShare/Fix_AutoLogin

Browse Source 
Fix AutoLogin
This commit is contained in:
G10h4ck 2020-06-10 10:19:55 +02:00 committed by GitHub
commit 1d8510069e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View File

@ -327,6 +327,8 @@ INCLUDEPATH *= $${OPENPGPSDK_DIR}
PRE_TARGETDEPS *= $${OPENPGPSDK_DIR}/lib/libops.a PRE_TARGETDEPS *= $${OPENPGPSDK_DIR}/lib/libops.a
LIBS *= $${OPENPGPSDK_DIR}/lib/libops.a -lbz2 LIBS *= $${OPENPGPSDK_DIR}/lib/libops.a -lbz2
################################### HEADERS & SOURCES #############################
HEADERS += ft/ftchunkmap.h \ HEADERS += ft/ftchunkmap.h \
ft/ftcontroller.h \ ft/ftcontroller.h \
ft/ftdata.h \ ft/ftdata.h \

10
libretroshare/src/rsserver/rsloginhandler.cc
View File

@ -26,6 +26,7 @@
#include "rsloginhandler.h" #include "rsloginhandler.h"
#include "util/rsdir.h" #include "util/rsdir.h"
#include "retroshare/rsinit.h" #include "retroshare/rsinit.h"
#include "util/rsdebug.h"
//#define DEBUG_RSLOGINHANDLER 1 //#define DEBUG_RSLOGINHANDLER 1
@ -497,8 +498,15 @@ bool RsLoginHandler::enableAutoLogin(const RsPeerId& ssl_id,const std::string& s
NULL); NULL);
if (error) { if (error) {
RsErr() << __PRETTY_FUNCTION__
<< " Could not store passwd using libsecret with"
<< " error.code=" << error->code
<< " error.domain=" << error->domain
<< " error.message=\"" << error->message << "\"" << std::endl;
if (error->code == 2)
RsErr() << "Do have a key wallet installed?" << std::endl
<< "Like gnome-keyring or other using \"Secret Service\" by DBus." << std::endl;
g_error_free (error); g_error_free (error);
std::cerr << "Could not store passwd using libsecret" << std::endl;
return false; return false;
} }
std::cout << "Stored passwd " << "************************" << " using libsecret" << std::endl; std::cout << "Stored passwd " << "************************" << " using libsecret" << std::endl;

5
libretroshare/src/use_libretroshare.pri
View File

@ -102,3 +102,8 @@ android-* {
CONFIG *= qt CONFIG *= qt
QT *= network QT *= network
} }
################################### Pkg-Config Stuff #############################
LIBS *= $$system(pkg-config --libs $$PKGCONFIG)

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -344,12 +344,16 @@ openbsd-* {
LIBS *= -rdynamic LIBS *= -rdynamic
} }
################################### COMMON stuff ##################################
wikipoos { wikipoos {
PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS *= -lglib-2.0 LIBS *= -lglib-2.0
} }
################################### HEADERS & SOURCES #############################
# Tor controller # Tor controller
HEADERS += TorControl/AddOnionCommand.h \ HEADERS += TorControl/AddOnionCommand.h \

10
retroshare-service/src/retroshare-service.pro
View File

@ -29,6 +29,8 @@ QT -= gui
SOURCES += retroshare-service.cc SOURCES += retroshare-service.cc
################################# Linux ##########################################
android-* { android-* {
QT += androidextras QT += androidextras
@ -56,11 +58,14 @@ appimage {
INSTALLS += desktop_files INSTALLS += desktop_files
} }
unix { unix {
target.path = "$${RS_BIN_DIR}" target.path = "$${RS_BIN_DIR}"
INSTALLS += target INSTALLS += target
} }
################################# MacOSX ##########################################
macx { macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD. # ENABLE THIS OPTION FOR Univeral Binary BUILD.
#CONFIG += ppc x86 #CONFIG += ppc x86
@ -81,6 +86,8 @@ macx {
INCLUDEPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR
} }
################################# Windows ##########################################
win32-g++ { win32-g++ {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
# show console output # show console output
@ -130,3 +137,6 @@ win32-g++ {
QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
} }
} }
################################### COMMON stuff ##################################