summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp34
-rw-r--r--core/opie-login/opie-login.pro4
2 files changed, 19 insertions, 19 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index bf98735..7d5792e 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -4,79 +4,79 @@
           .>+-=
 _;:,     .>    :=|. This file is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This file is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-#define _GNU_SOURCE
+#include "loginapplication.h"
+#include "loginwindowimpl.h"
+#include "calibrate.h"
+
+/* OPIE */
+#include <opie2/odevice.h>
+#include <qpe/qpestyle.h>
+#include <qpe/power.h>
+#include <qpe/config.h>
+/* QT */
+#include <qwindowsystem_qws.h>
+#include <qmessagebox.h>
+#include <qlabel.h>
+#include <qtimer.h>
+#include <qfile.h>
+
+/* STD */
#include <sys/types.h>
#include <time.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <unistd.h>
#include <syslog.h>
#include <sys/wait.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <getopt.h>
#include <string.h>
-#include <qpe/qpestyle.h>
-#include <qpe/power.h>
-#include <qpe/config.h>
-
-#include <opie/odevice.h>
-
-#include <qwindowsystem_qws.h>
-#include <qmessagebox.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qfile.h>
-
-#include "loginapplication.h"
-#include "loginwindowimpl.h"
-#include "calibrate.h"
-
using namespace Opie;
int login_main ( int argc, char **argv, pid_t ppid );
void sigterm ( int sig );
void sigint ( int sig );
void exit_closelog ( );
static struct option long_options [] = {
{ "autologin", 1, 0, 'a' },
{ 0, 0, 0, 0 }
};
int main ( int argc, char **argv )
{
int userExited = 0;
pid_t ppid = ::getpid ( );
if ( ::geteuid ( ) != 0 ) {
::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
return 1;
}
if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and
::setuid ( 0 ); // messes up things like config files
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 0fdd8e1..30ed859 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,28 +1,28 @@
TEMPLATE = app
-CONFIG = qt warn_on debug
+CONFIG = qt warn_on debug usepam
HEADERS = loginwindowimpl.h \
loginapplication.h \
../launcher/inputmethods.h \
../apps/calibrate/calibrate.h
SOURCES = loginwindowimpl.cpp \
loginapplication.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
+LIBS += -lqpe -lopiecore2
usepam:LIBS += -lpam
usepam:DEFINES += USEPAM
DESTDIR = $(OPIEDIR)/bin
TARGET = opie-login
include ( $(OPIEDIR)/include.pro )