| -rw-r--r-- | core/launcher/config.in | 2 | ||||
| -rw-r--r-- | core/launcher/server.pro | 2 | ||||
| -rw-r--r-- | core/launcher/serverapp.cpp | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/launcher/config.in b/core/launcher/config.in index 31da148..a11fed4 100644 --- a/core/launcher/config.in +++ b/core/launcher/config.in @@ -1,4 +1,4 @@ config LAUNCHER boolean "opie-taskbar (program launcher qpe for Opie)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQRSYNC + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2SECURITY && LIBQRSYNC diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 4e6a581..f366f54 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro @@ -65,20 +65,20 @@ SOURCES += server.cpp \ mediadlg.cpp INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate DEPENDPATH += $(OPIEDIR)/core/apps/calibrate INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync DEPENDPATH += $(OPIEDIR)/rsync INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount -LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync TARGET = qpe contains( $(CONFIG_TARGET_MACOSX), y ) { LIBS += -lcrypt } include ( $(OPIEDIR)/include.pro ) diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 3d88873..f1bce40 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -15,25 +15,26 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "serverapp.h" #include "screensaver.h" /* OPIE */ #include <opie2/odebug.h> #include <opie2/odevice.h> -#include <qtopia/password.h> +#include <opie2/multiauthpassword.h> + #include <qtopia/config.h> #include <qtopia/power.h> #ifdef Q_WS_QWS #include <qtopia/qcopenvelope_qws.h> #endif #include <qtopia/global.h> using namespace Opie::Core; /* QT */ #ifdef Q_WS_QWS #include <qgfx_qws.h> @@ -341,24 +342,25 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) connect( this, SIGNAL(power() ), SLOT(togglePower() ) ); rereadVolumes(); serverApp = this; apmTimeout(); grabKeyboard(); /* make sure the event filter is installed */ const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); + Q_CONST_UNUSED( but ) } ServerApplication::~ServerApplication() { ungrabKeyboard(); delete pa; delete m_ps; delete m_ps_last; } @@ -487,25 +489,25 @@ void ServerApplication::launcherMessage( const QCString & msg, const QByteArray } bool ServerApplication::screenLocked() { return loggedin == 0; } void ServerApplication::login(bool at_poweron) { if ( !loggedin ) { Global::terminateBuiltin("calibrate"); // No tr - Password::authenticate(at_poweron); + Opie::Security::MultiauthPassword::authenticate(at_poweron); loggedin=1; #ifndef QT_NO_COP QCopEnvelope e( "QPE/Desktop", "unlocked()" ); #endif } } #if defined(QPE_HAVE_TOGGLELIGHT) #include <qtopia/config.h> #include <sys/ioctl.h> #include <sys/types.h> @@ -543,25 +545,25 @@ void ServerApplication::togglePower() if ( excllock ) return ; excllock = true; bool wasloggedin = loggedin; loggedin = 0; m_suspendTime = QDateTime::currentDateTime(); #ifdef QWS - if ( Password::needToAuthenticate ( true ) && qt_screen ) { + if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. // But this would not show up fast enough QGfx *g = qt_screen-> screenGfx ( ); g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); delete g; } #endif ODevice::inst ( )-> suspend ( ); ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call QWSServer::screenSaverActivate ( false ); |