summaryrefslogtreecommitdiff
authorsandman <sandman>2002-07-27 23:33:26 (UTC)
committer sandman <sandman>2002-07-27 23:33:26 (UTC)
commit4baf36396739502c5471950e29f18954cca4517b (patch) (side-by-side diff)
tree46b25659b442666b4b5153fa8210d86e6708b47b
parent9cc89b6a54ee267953b0422c4607097d075ecab9 (diff)
downloadopie-4baf36396739502c5471950e29f18954cca4517b.zip
opie-4baf36396739502c5471950e29f18954cca4517b.tar.gz
opie-4baf36396739502c5471950e29f18954cca4517b.tar.bz2
Update for OPIE to use opie-login
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
-rw-r--r--core/launcher/main.cpp12
-rw-r--r--core/opie-login/opie-login.control9
-rwxr-xr-xroot/etc/init.d/opie7
4 files changed, 16 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 28e5c41..367cfda 100644
--- a/Makefile
+++ b/Makefile
@@ -35,4 +35,5 @@ COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
core/apps/textedit core/apps/embeddedkonsole \
core/launcher \
+ core/opie-login \
core/apps/oipkg core/apps/qcop
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
@@ -46,8 +46,4 @@
#endif
-#ifdef QT_QWS_LOGIN
-#include "../login/qdmdialogimpl.h"
-#endif
-
#ifdef QT_QWS_CASSIOPEIA
static void ignoreMessage( QtMsgType, const char * )
@@ -304,12 +300,4 @@ 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();
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
@@ -45,5 +45,9 @@ case $1 in
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
;;
@@ -51,4 +55,5 @@ case $1 in
echo "Killing Opie..."
killproc qpe
+ killproc opie-login
;;
*)