| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | core/launcher/main.cpp | 12 | ||||
| -rw-r--r-- | core/opie-login/opie-login.control | 9 | ||||
| -rwxr-xr-x | root/etc/init.d/opie | 5 |
4 files changed, 15 insertions, 12 deletions
@@ -34,6 +34,7 @@ PIMAPPS = core/pim/addressbook core/pim/datebook \ COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ core/apps/textedit core/apps/embeddedkonsole \ core/launcher \ + core/opie-login \ core/apps/oipkg core/apps/qcop COREMULTIMEDIA = core/multimedia/opieplayer diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index b3c331b..a19da14 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -45,10 +45,6 @@ #include "../calibrate/calibrate.h" #endif -#ifdef QT_QWS_LOGIN -#include "../login/qdmdialogimpl.h" -#endif - #ifdef QT_QWS_CASSIOPEIA static void ignoreMessage( QtMsgType, const char * ) { @@ -303,14 +299,6 @@ int initApplication( int argc, char ** argv ) AlarmServer::initialize(); -#if defined(QT_QWS_LOGIN) - for( int i=0; i<a.argc(); i++ ) - if( strcmp( a.argv()[i], "-login" ) == 0 ) { - QDMDialogImpl::login( ); - return 0; - } -#endif - Desktop *d = new Desktop(); QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); diff --git a/core/opie-login/opie-login.control b/core/opie-login/opie-login.control new file mode 100644 index 0000000..d87fc6c --- a/dev/null +++ b/core/opie-login/opie-login.control @@ -0,0 +1,9 @@ +Files: bin/opie-login +Priority: optional +Section: opie/system +Maintainer: Project Opie <opie@handhelds.org> +Architecture: arm +Version: $QPE_VERSION-$SUB_VERSION +Depends: opie-base ($QPE_VERSION), libopie +Description: Multiuser login for OPIE + A xdm/kdm equivalent for OPIE. diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie index b5a185e..eed69c2 100755 --- a/root/etc/init.d/opie +++ b/root/etc/init.d/opie @@ -44,12 +44,17 @@ case $1 in *) echo "Unknown processor type -`module_id`-!" ;; esac + if [ -x $OPIEDIR/bin/opie-login ]; then + $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & + else $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & + fi ;; 'stop') echo "Killing Opie..." killproc qpe + killproc opie-login ;; *) echo "usage: $0 { start | stop }" |