From e5e468b083059cbbb091c5e8ffc7605c5ec54e60 Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Tue, 12 May 2020 19:52:49 +0200
Subject: [PATCH] Fix AutoLogin

---
 libretroshare/src/libretroshare.pro           |  2 ++
 libretroshare/src/rsserver/rsloginhandler.cc  | 10 +++++++++-
 libretroshare/src/use_libretroshare.pri       |  5 +++++
 retroshare-gui/src/retroshare-gui.pro         |  4 ++++
 retroshare-service/src/retroshare-service.pro | 10 ++++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index c7b38ce0b..495caf4b2 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -327,6 +327,8 @@ INCLUDEPATH *= $${OPENPGPSDK_DIR}
 PRE_TARGETDEPS *= $${OPENPGPSDK_DIR}/lib/libops.a
 LIBS *= $${OPENPGPSDK_DIR}/lib/libops.a -lbz2
 
+################################### HEADERS & SOURCES #############################
+
 HEADERS +=	ft/ftchunkmap.h \
 			ft/ftcontroller.h \
 			ft/ftdata.h \
diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc
index 8a0469e1d..dbe023235 100644
--- a/libretroshare/src/rsserver/rsloginhandler.cc
+++ b/libretroshare/src/rsserver/rsloginhandler.cc
@@ -26,6 +26,7 @@
 #include "rsloginhandler.h"
 #include "util/rsdir.h"
 #include "retroshare/rsinit.h"
+#include "util/rsdebug.h"
 
 //#define DEBUG_RSLOGINHANDLER 1
 
@@ -497,8 +498,15 @@ bool RsLoginHandler::enableAutoLogin(const RsPeerId& ssl_id,const std::string& s
 	                            NULL);
 
 	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);
-		std::cerr << "Could not store passwd using libsecret" << std::endl;
 		return false;
 	}
 	std::cout << "Stored passwd " << "************************" << " using libsecret" << std::endl;
diff --git a/libretroshare/src/use_libretroshare.pri b/libretroshare/src/use_libretroshare.pri
index 681805a7f..eb7a4e470 100644
--- a/libretroshare/src/use_libretroshare.pri
+++ b/libretroshare/src/use_libretroshare.pri
@@ -102,3 +102,8 @@ android-* {
     CONFIG *= qt
     QT *= network
 }
+
+################################### Pkg-Config Stuff #############################
+
+LIBS *= $$system(pkg-config --libs $$PKGCONFIG)
+
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index a5d6838ae..68f2987c0 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -344,12 +344,16 @@ openbsd-* {
 	LIBS *= -rdynamic
 }
 
+################################### COMMON stuff ##################################
+
 wikipoos {
 	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 	LIBS *= -lglib-2.0
 }
 
+################################### HEADERS & SOURCES #############################
+
 # Tor controller
 
 HEADERS += 	TorControl/AddOnionCommand.h \
diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 75cb0b581..ae3b38049 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -29,6 +29,8 @@ QT -= gui
 
 SOURCES += retroshare-service.cc
 
+################################# Linux ##########################################
+
 android-* {
     QT += androidextras
 
@@ -56,11 +58,14 @@ appimage {
     INSTALLS += desktop_files
 }
 
+
 unix {
     target.path = "$${RS_BIN_DIR}"
     INSTALLS += target
 }
 
+################################# MacOSX ##########################################
+
 macx {
 	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
 	#CONFIG += ppc x86
@@ -81,6 +86,8 @@ macx {
 	INCLUDEPATH += . $$INC_DIR
 }
 
+################################# Windows ##########################################
+
 win32-g++ {
 	CONFIG(debug, debug|release) {
 		# show console output
@@ -130,3 +137,6 @@ win32-g++ {
 		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
 	}
 }
+
+################################### COMMON stuff ##################################
+