summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -25,24 +25,25 @@ PLAYER = core/multimedia/opieplayer/libmpeg3 \
core/multimedia/opieplayer/wavplugin \
core/multimedia/opieplayer/modplug
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 \
NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
noncore/settings/appearance noncore/settings/sound \
noncore/settings/mediummount \
noncore/settings/tabmanager noncore/settings/appskey \
noncore/settings/netsystemtime \
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
@@ -36,28 +36,24 @@
#include <qpe/qcopenvelope_qws.h>
#include <qpe/alarmserver.h>
#include <stdlib.h>
#include <stdio.h>
#include <signal.h>
#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>
#include <sys/stat.h>
#include <sys/time.h>
#include <fcntl.h>
#include <qdatetime.h>
void initCassiopeia()
@@ -294,32 +290,24 @@ int initApplication( int argc, char ** argv )
#endif
//Don't flicker at startup:
QWSServer::setDesktopBackground( QImage() );
DesktopApplication a( argc, argv, QApplication::GuiServer );
(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()) );
QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) );
QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) );
QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) );
QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) );
QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) );
QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) );
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
@@ -35,24 +35,29 @@ case $1 in
cd $HOME
rm -f /etc/rc2.d/S99x # Can't have both running!
case `module_id` in
"3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
"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