| -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 | 7 |
4 files changed, 16 insertions, 13 deletions
@@ -31,12 +31,13 @@ COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) PIMAPPS = core/pim/addressbook core/pim/datebook \ core/pim/today core/pim/todo 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 CORESETTINGS = core/settings/light-and-power core/settings/security \ core/settings/systemtime core/settings/citytime \ 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 @@ -42,16 +42,12 @@ #include <unistd.h> #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) #include "../calibrate/calibrate.h" #endif -#ifdef QT_QWS_LOGIN -#include "../login/qdmdialogimpl.h" -#endif - #ifdef QT_QWS_CASSIOPEIA static void ignoreMessage( QtMsgType, const char * ) { } #include <sys/mount.h> #include <sys/types.h> @@ -300,20 +296,12 @@ int initApplication( int argc, char ** argv ) (void) new ModelKeyFilter ( ); initBacklight(); 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()) ); QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); QObject::connect( &a, SIGNAL(launch()), d, SLOT(raiseLauncher()) ); QObject::connect( &a, SIGNAL(email()), d, SLOT(raiseEmail()) ); 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 @@ -41,18 +41,23 @@ case $1 in "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; *) echo "Unknown processor type -`module_id`-!" ;; esac - $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & + 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 }" ;; esac |