| author | sandman <sandman> | 2002-08-01 14:05:32 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-08-01 14:05:32 (UTC) |
| commit | 66c4051568427ae3ffd5d8707e1cc91ce8ffbe62 (patch) (side-by-side diff) | |
| tree | efeb6b333374349c4e08fbd8c3c16acc727f394b | |
| parent | 32b7fdb0e9e5ec6cb6f791962efe68c40564b178 (diff) | |
| download | opie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.zip opie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.tar.gz opie-66c4051568427ae3ffd5d8707e1cc91ce8ffbe62.tar.bz2 | |
Revert the non-gcc3-fix part of the gcc3-fix from Harlekin
| -rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 1 | ||||
| -rw-r--r-- | core/opie-login/opie-login.pro | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index 26d9225..3265b46 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp @@ -1,72 +1,71 @@ #include <qapplication.h> #include <qpushbutton.h> #include <qlayout.h> #include <qframe.h> #include <qlineedit.h> #include <qtimer.h> #include <qcombobox.h> #include <qpixmap.h> #include <qlabel.h> #include <qpopupmenu.h> #include <qmessagebox.h> #include <qpe/qcopenvelope_qws.h> #include <opie/odevice.h> #include <stdio.h> #include <pwd.h> #include <grp.h> #include <unistd.h> #include <stdlib.h> -#undef USEPAM // FOR my toolchain #ifdef USEPAM extern "C" { #include <security/pam_appl.h> } #else #include <crypt.h> #include <shadow.h> #endif #include "loginwindowimpl.h" #include "inputmethods.h" LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) { QPopupMenu *pop = new QPopupMenu ( this ); pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( ))); m_menu-> setPopup ( pop ); QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); m_input = new InputMethods ( m_taskbar ); lay-> addWidget ( m_input ); lay-> addStretch ( 10 ); setActiveWindow ( ); m_password-> setFocus ( ); m_user-> insertStringList ( getAllUsers ( )); QTimer::singleShot ( 0, this, SLOT( showIM ( ))); QString opiedir = ::getenv ( "OPIEDIR" ); QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" ); if ( !bgpix. isNull ( )) setBackgroundPixmap ( bgpix ); m_caption-> setText ( m_caption-> text ( ) + tr( "<center><h1><u>%1 %2</u></h1></center>" ). arg ( ODevice::inst ( )-> systemString ( )). arg ( ODevice::inst ( )-> systemVersionString ( ))); } LoginWindowImpl::~LoginWindowImpl ( ) { } void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) { switch ( e-> key ( )) { case Key_F34: suspend ( ); break; diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro index ef449ab..35c1ed0 100644 --- a/core/opie-login/opie-login.pro +++ b/core/opie-login/opie-login.pro @@ -1,25 +1,25 @@ TEMPLATE = app CONFIG = qt warn_on debug usepam HEADERS = loginwindowimpl.h \ ../launcher/inputmethods.h \ ../apps/calibrate/calibrate.h SOURCES = loginwindowimpl.cpp \ ../launcher/inputmethods.cpp \ ../apps/calibrate/calibrate.cpp \ main.cpp INTERFACES = loginwindow.ui INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate LIBS += -lqpe -lopie -#usepam:LIBS += -lpam -#usepam:DEFINES += USEPAM +usepam:LIBS += -lpam +usepam:DEFINES += USEPAM DESTDIR = $(OPIEDIR)/bin TARGET = opie-login |