summaryrefslogtreecommitdiff
authorsandman <sandman>2002-07-27 23:33:26 (UTC)
committer sandman <sandman>2002-07-27 23:33:26 (UTC)
commit4baf36396739502c5471950e29f18954cca4517b (patch) (unidiff)
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
@@ -33,8 +33,9 @@ PIMAPPS = core/pim/addressbook core/pim/datebook \
33 33
34COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ 34COREAPPS = 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
39COREMULTIMEDIA = core/multimedia/opieplayer 40COREMULTIMEDIA = core/multimedia/opieplayer
40 41
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
@@ -44,12 +44,8 @@
44#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 44#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
45#include "../calibrate/calibrate.h" 45#include "../calibrate/calibrate.h"
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
53static void ignoreMessage( QtMsgType, const char * ) 49static void ignoreMessage( QtMsgType, const char * )
54{ 50{
55} 51}
@@ -302,16 +298,8 @@ int initApplication( int argc, char ** argv )
302 initBacklight(); 298 initBacklight();
303 299
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
316 QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) ); 304 QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) );
317 QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) ); 305 QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) );
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 @@
1Files: bin/opie-login
2Priority: optional
3Section: opie/system
4Maintainer: Project Opie <opie@handhelds.org>
5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION), libopie
8Description: 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
@@ -43,14 +43,19 @@ case $1 in
43 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 43 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
44 *) echo "Unknown processor type -`module_id`-!" ;; 44 *) echo "Unknown processor type -`module_id`-!" ;;
45 esac 45 esac
46 46
47 $OPIEDIR/bin/qpe 2>/dev/null >/dev/null & 47 if [ -x $OPIEDIR/bin/opie-login ]; then
48 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
49 else
50 $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
51 fi
48 52
49 ;; 53 ;;
50'stop') 54'stop')
51 echo "Killing Opie..." 55 echo "Killing Opie..."
52 killproc qpe 56 killproc qpe
57 killproc opie-login
53 ;; 58 ;;
54*) 59*)
55 echo "usage: $0 { start | stop }" 60 echo "usage: $0 { start | stop }"
56 ;; 61 ;;