1 files changed, 11 insertions, 4 deletions

diff --git a/core/opie-login/loginapplication.cpp b/core/opie-login/loginapplication.cpp
index 1facf2d..764b24b 100644
--- a/core/opie-login/loginapplication.cpp
+++ b/core/opie-login/loginapplication.cpp
@@ -22,12 +22,20 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include "loginapplication.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
+
+/* STD */
 #include <pwd.h>
 #include <grp.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/stat.h>
@@ -39,13 +47,12 @@ extern "C" {
 }
 #else
 #include <crypt.h>
 #include <shadow.h>
 #endif
 
-#include "loginapplication.h"
 
 LoginApplication *lApp;
 
 LoginApplication::LoginApplication ( int &argc, char **argv, pid_t parentpid )
         : QPEApplication ( argc, argv, GuiServer )
 {
@@ -159,13 +166,13 @@ bool LoginApplication::changeIdentity ( )
         struct passwd *pw = ::getpwnam ( s_username );
         if ( !pw )
                 return false;
 
         // we are still root at this point - try to run the pre-session script
         if ( !runRootScript ( "OPIEDIR", "share/opie-login/pre-session", s_username ))
-                qWarning ( "failed to run $OPIEDIR/share/opie-login/pre-session" );
+        owarn << "failed to run $OPIEDIR/share/opie-login/pre-session" << oendl;
 
         bool fail = false;
         fail |= ( ::initgroups ( pw-> pw_name, pw-> pw_gid ));
         ::endgrent ( );
         fail |= ( ::setgid ( pw-> pw_gid ));
         fail |= ( ::setuid ( pw-> pw_uid ));
@@ -184,21 +191,21 @@ bool LoginApplication::changeIdentity ( )
 bool LoginApplication::login ( )
 {
         execUserScript ( "HOME", ".opie-session" );
         execUserScript ( "OPIEDIR", "share/opie-login/opie-session" );
         execUserScript ( "OPIEDIR", "bin/qpe" );
         
-        qWarning ( "failed to start an Opie session" );
+    owarn << "failed to start an Opie session" << oendl;
         return false;
 }
 
 void LoginApplication::logout ( )
 {
         // we are now root again - try to run the post-session script
         if ( !runRootScript ( "OPIEDIR", "share/opie-login/post-session" ))
-                        qWarning ( "failed to run $OPIEDIR/scripts/post-session" );
+        owarn << "failed to run $OPIEDIR/scripts/post-session" << oendl;
 }
 
 
 static char *buildarg ( const char *base, const char *script )
 {
         const char *dir = base ? ::getenv ( base ) : "/";