-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
@@ -35,4 +35,5 @@ COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ | |||
35 | core/apps/textedit core/apps/embeddedkonsole \ | 35 | core/apps/textedit core/apps/embeddedkonsole \ |
36 | core/launcher \ | 36 | core/launcher \ |
37 | core/opie-login \ | ||
37 | core/apps/oipkg core/apps/qcop | 38 | core/apps/oipkg core/apps/qcop |
38 | 39 | ||
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 @@ | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #ifdef QT_QWS_LOGIN | ||
49 | #include "../login/qdmdialogimpl.h" | ||
50 | #endif | ||
51 | |||
52 | #ifdef QT_QWS_CASSIOPEIA | 48 | #ifdef QT_QWS_CASSIOPEIA |
53 | static void ignoreMessage( QtMsgType, const char * ) | 49 | static void ignoreMessage( QtMsgType, const char * ) |
@@ -304,12 +300,4 @@ int initApplication( int argc, char ** argv ) | |||
304 | AlarmServer::initialize(); | 300 | AlarmServer::initialize(); |
305 | 301 | ||
306 | #if defined(QT_QWS_LOGIN) | ||
307 | for( int i=0; i<a.argc(); i++ ) | ||
308 | if( strcmp( a.argv()[i], "-login" ) == 0 ) { | ||
309 | QDMDialogImpl::login( ); | ||
310 | return 0; | ||
311 | } | ||
312 | #endif | ||
313 | |||
314 | Desktop *d = new Desktop(); | 302 | Desktop *d = new Desktop(); |
315 | 303 | ||
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 @@ | |||
1 | Files: bin/opie-login | ||
2 | Priority: optional | ||
3 | Section: opie/system | ||
4 | Maintainer: Project Opie <opie@handhelds.org> | ||
5 | Architecture: arm | ||
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Depends: opie-base ($QPE_VERSION), libopie | ||
8 | Description: Multiuser login for OPIE | ||
9 | 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 | |||
45 | esac | 45 | esac |
46 | 46 | ||
47 | if [ -x $OPIEDIR/bin/opie-login ]; then | ||
48 | $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & | ||
49 | else | ||
47 | $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & | 50 | $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & |
51 | fi | ||
48 | 52 | ||
49 | ;; | 53 | ;; |
@@ -51,4 +55,5 @@ case $1 in | |||
51 | echo "Killing Opie..." | 55 | echo "Killing Opie..." |
52 | killproc qpe | 56 | killproc qpe |
57 | killproc opie-login | ||
53 | ;; | 58 | ;; |
54 | *) | 59 | *) |