author | zecke <zecke> | 2004-07-17 17:51:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-17 17:51:32 (UTC) |
commit | 9b5be1aa88f98bfe939563898e8fa340dbb7fa3f (patch) (unidiff) | |
tree | df938b8250e003b44f75c0fc0dedac2dbc782ddf /core | |
parent | 0f64024dc631d9043d2f6f4f6bcafaac7eddd545 (diff) | |
download | opie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.zip opie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.tar.gz opie-9b5be1aa88f98bfe939563898e8fa340dbb7fa3f.tar.bz2 |
-Add depedenncy on OMAF
-Link against OMAF
-Finally use OMAF
-rw-r--r-- | core/launcher/config.in | 2 | ||||
-rw-r--r-- | core/launcher/server.pro | 2 | ||||
-rw-r--r-- | core/launcher/serverapp.cpp | 14 |
3 files changed, 10 insertions, 8 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 @@ | |||
1 | config LAUNCHER | 1 | config LAUNCHER |
2 | boolean "opie-taskbar (program launcher qpe for Opie)" | 2 | boolean "opie-taskbar (program launcher qpe for Opie)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQRSYNC | 4 | 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 | |||
@@ -74,7 +74,7 @@ DEPENDPATH += $(OPIEDIR)/rsync | |||
74 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount | 74 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount |
75 | DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount | 75 | DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount |
76 | 76 | ||
77 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync | 77 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync |
78 | TARGET = qpe | 78 | TARGET = qpe |
79 | 79 | ||
80 | contains( $(CONFIG_TARGET_MACOSX), y ) { | 80 | contains( $(CONFIG_TARGET_MACOSX), y ) { |
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 | |||
@@ -24,7 +24,8 @@ | |||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/odevice.h> | 26 | #include <opie2/odevice.h> |
27 | #include <qtopia/password.h> | 27 | #include <opie2/multiauthpassword.h> |
28 | |||
28 | #include <qtopia/config.h> | 29 | #include <qtopia/config.h> |
29 | #include <qtopia/power.h> | 30 | #include <qtopia/power.h> |
30 | 31 | ||
@@ -350,6 +351,7 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
350 | 351 | ||
351 | /* make sure the event filter is installed */ | 352 | /* make sure the event filter is installed */ |
352 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); | 353 | const ODeviceButton* but = ODevice::inst()->buttonForKeycode( -1 ); |
354 | Q_CONST_UNUSED( but ) | ||
353 | } | 355 | } |
354 | 356 | ||
355 | 357 | ||
@@ -495,11 +497,11 @@ bool ServerApplication::screenLocked() | |||
495 | void ServerApplication::login(bool at_poweron) | 497 | void ServerApplication::login(bool at_poweron) |
496 | { | 498 | { |
497 | if ( !loggedin ) { | 499 | if ( !loggedin ) { |
498 | Global::terminateBuiltin("calibrate"); // No tr | 500 | Global::terminateBuiltin("calibrate"); // No tr |
499 | Password::authenticate(at_poweron); | 501 | Opie::Security::MultiauthPassword::authenticate(at_poweron); |
500 | loggedin=1; | 502 | loggedin=1; |
501 | #ifndef QT_NO_COP | 503 | #ifndef QT_NO_COP |
502 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 504 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
503 | #endif | 505 | #endif |
504 | } | 506 | } |
505 | } | 507 | } |
@@ -552,7 +554,7 @@ void ServerApplication::togglePower() | |||
552 | 554 | ||
553 | #ifdef QWS | 555 | #ifdef QWS |
554 | 556 | ||
555 | if ( Password::needToAuthenticate ( true ) && qt_screen ) { | 557 | if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { |
556 | // Should use a big black window instead. | 558 | // Should use a big black window instead. |
557 | // But this would not show up fast enough | 559 | // But this would not show up fast enough |
558 | QGfx *g = qt_screen-> screenGfx ( ); | 560 | QGfx *g = qt_screen-> screenGfx ( ); |