-rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 4 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 4 | ||||
-rw-r--r-- | core/opie-login/opie-login.pro | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index 330fac5..3037ba3 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp | |||
@@ -4,60 +4,56 @@ | |||
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | #include <qpe/version.h> | 27 | #include <qpe/version.h> |
28 | #include <qapplication.h> | ||
29 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
30 | #include <qlayout.h> | 29 | #include <qlayout.h> |
31 | #include <qframe.h> | ||
32 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
33 | #include <qtimer.h> | 31 | #include <qtimer.h> |
34 | #include <qcombobox.h> | 32 | #include <qcombobox.h> |
35 | #include <qpixmap.h> | ||
36 | #include <qlabel.h> | 33 | #include <qlabel.h> |
37 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
38 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
39 | #include <qimage.h> | ||
40 | #if QT_VERSION < 300 | 36 | #if QT_VERSION < 300 |
41 | #include <qgfx_qws.h> | 37 | #include <qgfx_qws.h> |
42 | #endif | 38 | #endif |
43 | #include <qwindowsystem_qws.h> | 39 | #include <qwindowsystem_qws.h> |
44 | 40 | ||
45 | #include <qpe/resource.h> | 41 | #include <qpe/resource.h> |
46 | #include <qpe/qcopenvelope_qws.h> | 42 | #include <qpe/qcopenvelope_qws.h> |
47 | #include <qpe/config.h> | 43 | #include <qpe/config.h> |
48 | 44 | ||
49 | #include <opie/odevice.h> | 45 | #include <opie/odevice.h> |
50 | 46 | ||
51 | #include <stdio.h> | 47 | #include <stdio.h> |
52 | #include <stdlib.h> | 48 | #include <stdlib.h> |
53 | 49 | ||
54 | #include "loginwindowimpl.h" | 50 | #include "loginwindowimpl.h" |
55 | #include "loginapplication.h" | 51 | #include "loginapplication.h" |
56 | #include "inputmethods.h" | 52 | #include "inputmethods.h" |
57 | 53 | ||
58 | using namespace Opie; | 54 | using namespace Opie; |
59 | 55 | ||
60 | 56 | ||
61 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) | 57 | LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) |
62 | { | 58 | { |
63 | QPopupMenu *pop = new QPopupMenu ( this ); | 59 | QPopupMenu *pop = new QPopupMenu ( this ); |
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 7d2ed63..bf98735 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -19,63 +19,59 @@ | |||
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #define _GNU_SOURCE | 28 | #define _GNU_SOURCE |
29 | 29 | ||
30 | #include <sys/types.h> | 30 | #include <sys/types.h> |
31 | #include <time.h> | 31 | #include <time.h> |
32 | #include <sys/time.h> | 32 | #include <sys/time.h> |
33 | #include <sys/resource.h> | 33 | #include <sys/resource.h> |
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | #include <syslog.h> | 35 | #include <syslog.h> |
36 | #include <sys/wait.h> | 36 | #include <sys/wait.h> |
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
39 | #include <signal.h> | 39 | #include <signal.h> |
40 | #include <getopt.h> | 40 | #include <getopt.h> |
41 | #include <string.h> | 41 | #include <string.h> |
42 | 42 | ||
43 | #include <qpe/qpeapplication.h> | ||
44 | #include <qpe/qcopenvelope_qws.h> | ||
45 | #include <qpe/qpestyle.h> | 43 | #include <qpe/qpestyle.h> |
46 | #include <qpe/power.h> | 44 | #include <qpe/power.h> |
47 | #include <qpe/config.h> | 45 | #include <qpe/config.h> |
48 | 46 | ||
49 | #include <opie/odevice.h> | 47 | #include <opie/odevice.h> |
50 | 48 | ||
51 | #include <qwindowsystem_qws.h> | 49 | #include <qwindowsystem_qws.h> |
52 | #include <qwsmouse_qws.h> | ||
53 | #include <qmessagebox.h> | 50 | #include <qmessagebox.h> |
54 | #include <qlabel.h> | 51 | #include <qlabel.h> |
55 | #include <qtimer.h> | 52 | #include <qtimer.h> |
56 | #include <qfile.h> | 53 | #include <qfile.h> |
57 | #include <qtextstream.h> | ||
58 | 54 | ||
59 | #include "loginapplication.h" | 55 | #include "loginapplication.h" |
60 | #include "loginwindowimpl.h" | 56 | #include "loginwindowimpl.h" |
61 | #include "calibrate.h" | 57 | #include "calibrate.h" |
62 | 58 | ||
63 | using namespace Opie; | 59 | using namespace Opie; |
64 | 60 | ||
65 | int login_main ( int argc, char **argv, pid_t ppid ); | 61 | int login_main ( int argc, char **argv, pid_t ppid ); |
66 | void sigterm ( int sig ); | 62 | void sigterm ( int sig ); |
67 | void sigint ( int sig ); | 63 | void sigint ( int sig ); |
68 | void exit_closelog ( ); | 64 | void exit_closelog ( ); |
69 | 65 | ||
70 | static struct option long_options [] = { | 66 | static struct option long_options [] = { |
71 | { "autologin", 1, 0, 'a' }, | 67 | { "autologin", 1, 0, 'a' }, |
72 | { 0, 0, 0, 0 } | 68 | { 0, 0, 0, 0 } |
73 | }; | 69 | }; |
74 | 70 | ||
75 | 71 | ||
76 | int main ( int argc, char **argv ) | 72 | int main ( int argc, char **argv ) |
77 | { | 73 | { |
78 | int userExited = 0; | 74 | int userExited = 0; |
79 | pid_t ppid = ::getpid ( ); | 75 | pid_t ppid = ::getpid ( ); |
80 | 76 | ||
81 | if ( ::geteuid ( ) != 0 ) { | 77 | if ( ::geteuid ( ) != 0 ) { |
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro index f9dbe2b..0fdd8e1 100644 --- a/core/opie-login/opie-login.pro +++ b/core/opie-login/opie-login.pro | |||
@@ -1,26 +1,26 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on debug usepam | 2 | CONFIG = qt warn_on debug |
3 | 3 | ||
4 | HEADERS = loginwindowimpl.h \ | 4 | HEADERS = loginwindowimpl.h \ |
5 | loginapplication.h \ | 5 | loginapplication.h \ |
6 | ../launcher/inputmethods.h \ | 6 | ../launcher/inputmethods.h \ |
7 | ../apps/calibrate/calibrate.h | 7 | ../apps/calibrate/calibrate.h |
8 | 8 | ||
9 | SOURCES = loginwindowimpl.cpp \ | 9 | SOURCES = loginwindowimpl.cpp \ |
10 | loginapplication.cpp \ | 10 | loginapplication.cpp \ |
11 | ../launcher/inputmethods.cpp \ | 11 | ../launcher/inputmethods.cpp \ |
12 | ../apps/calibrate/calibrate.cpp \ | 12 | ../apps/calibrate/calibrate.cpp \ |
13 | main.cpp | 13 | main.cpp |
14 | 14 | ||
15 | INTERFACES = loginwindow.ui | 15 | INTERFACES = loginwindow.ui |
16 | 16 | ||
17 | INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate | 17 | INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate |
18 | DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate | 18 | DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate |
19 | 19 | ||
20 | LIBS += -lqpe -lopie | 20 | LIBS += -lqpe -lopie |
21 | 21 | ||
22 | usepam:LIBS += -lpam | 22 | usepam:LIBS += -lpam |
23 | usepam:DEFINES += USEPAM | 23 | usepam:DEFINES += USEPAM |
24 | 24 | ||
25 | DESTDIR = $(OPIEDIR)/bin | 25 | DESTDIR = $(OPIEDIR)/bin |
26 | TARGET = opie-login | 26 | TARGET = opie-login |