mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-15 16:49:20 -05:00
Made autologin optional at compile time
Autologin is disabled by default at compile time, and a warning to discourage it's usage is printed if it is enabled. This will make default RetroShare build safer and reduce dependencies as example we don't depends anymore on gnome keyring is not needed in default build for linux anymore.
This commit is contained in:
parent
6890669820
commit
8656452c68
10 changed files with 202 additions and 146 deletions
|
|
@ -35,12 +35,17 @@ StartDialog::StartDialog(QWidget *parent)
|
|||
/* Invoke Qt Designer generated QObject setup routine */
|
||||
ui.setupUi(this);
|
||||
|
||||
#ifdef RS_AUTOLOGIN
|
||||
connect(ui.autologin_checkbox, SIGNAL(clicked()), this, SLOT(notSecureWarning()));
|
||||
#else
|
||||
ui.autologin_checkbox->setHidden(true);
|
||||
#endif
|
||||
|
||||
Settings->loadWidgetInformation(this);
|
||||
|
||||
ui.loadButton->setFocus();
|
||||
|
||||
connect(ui.loadButton, SIGNAL(clicked()), this, SLOT(loadPerson()));
|
||||
connect(ui.autologin_checkbox, SIGNAL(clicked()), this, SLOT(notSecureWarning()));
|
||||
|
||||
/* get all available pgp private certificates....
|
||||
* mark last one as default.
|
||||
|
|
@ -115,6 +120,7 @@ bool StartDialog::requestedNewCert()
|
|||
return reqNewCert;
|
||||
}
|
||||
|
||||
#ifdef RS_AUTOLOGIN
|
||||
void StartDialog::notSecureWarning()
|
||||
{
|
||||
/* some error msg */
|
||||
|
|
@ -130,3 +136,4 @@ void StartDialog::notSecureWarning()
|
|||
#endif
|
||||
#endif
|
||||
}
|
||||
#endif // RS_AUTOLOGIN
|
||||
|
|
|
|||
|
|
@ -40,10 +40,12 @@ protected:
|
|||
private slots:
|
||||
void loadPerson();
|
||||
|
||||
#ifdef RS_AUTOLOGIN
|
||||
/**
|
||||
* Warns the user that autologin is not secure
|
||||
*/
|
||||
void notSecureWarning();
|
||||
#endif // RS_AUTOLOGIN
|
||||
|
||||
void on_labelProfile_linkActivated(QString link);
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,16 @@
|
|||
<normaloff>:/images/logo/logo_32.png</normaloff>:/images/logo/logo_32.png</iconset>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<property name="margin">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
|
|
@ -198,6 +207,12 @@
|
|||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@ INCLUDEPATH *= retroshare-gui
|
|||
################################# Linux ##########################################
|
||||
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
|
||||
linux-* {
|
||||
CONFIG += link_pkgconfig
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
#CONFIG += version_detail_bash_script
|
||||
QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
|
||||
|
||||
|
|
@ -78,7 +79,6 @@ linux-* {
|
|||
|
||||
LIBS *= -rdynamic
|
||||
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
|
||||
DEFINES *= HAS_GNOME_KEYRING
|
||||
}
|
||||
|
||||
unix {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue