summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-08 23:40:04 (UTC)
committer mickeyl <mickeyl>2005-02-08 23:40:04 (UTC)
commitdf9f73f2505ac66e804aca3bf490b80e61d3f90d (patch) (unidiff)
treebcf38ecaaac77bf517c04c32649529beebf95900
parentb61772fe39346e724f560161d9885589ba86a23f (diff)
downloadopie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.zip
opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.gz
opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.bz2
catch up w/ override changes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/main.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 2de0180..711bedc 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -6,8 +6,8 @@
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; version 2 of the License.
10     ._= =}       : or (at your option) any later version. 10     ._= =}       :
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;
@@ -321,16 +321,11 @@ private:
321}; 321};
322 322
323 323
324namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting
325
326
327int login_main ( int argc, char **argv, pid_t ppid ) 324int login_main ( int argc, char **argv, pid_t ppid )
328{ 325{
329 QWSServer::setDesktopBackground( QImage() ); 326 QWSServer::setDesktopBackground( QImage() );
330 LoginApplication *app = new LoginApplication ( argc, argv, ppid ); 327 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
331 328
332 Opie::force_appearance = 0;
333
334 app-> setFont ( QFont ( "Helvetica", 10 )); 329 app-> setFont ( QFont ( "Helvetica", 10 ));
335 app-> setStyle ( new QPEStyle ( )); 330 app-> setStyle ( new QPEStyle ( ));
336 331