[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-20 13:31:18
Message-ID: 20050220133118.36A571B964 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

make it less hacky.


  M +15 -0     kgdialog.cpp   1.24
  M +3 -1      kgdialog.h   1.10
  M +0 -30     kgreeter.cpp   1.136
  M +0 -4      kgreeter.h   1.44


--- kdebase/kdm/kfrontend/kgdialog.cpp  #1.23:1.24
@@ -24,4 +24,5 @@ Foundation, Inc., 59 Temple Place - Suit
 
 #include "kgdialog.h"
+#include "kgverify.h"
 #include "kconsole.h"
 #include "kdmshutdown.h"
@@ -45,4 +46,5 @@ KGDialog::KGDialog( bool themed ) : inhe
 
         optMenu = 0;
+        verify = 0;
 }
 
@@ -128,4 +130,6 @@ void
 KGDialog::slotExit()
 {
+        if (verify)
+                verify->abort();
         ::exit( EX_RESERVER_DPY );
 }
@@ -154,9 +158,16 @@ KGDialog::slotConsole()
         dpySpec *sess = fetchSessions( 0 );
         if (sess) {
+                if (verify)
+                        verify->suspend();
                 int ret = KDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec();
+                if (verify)
+                        verify->resume();
                 disposeSessions( sess );
                 if (!ret)
                         return;
         }
+#else
+        if (verify)
+                verify->abort();
 #endif
         GSet( 1 );
@@ -168,8 +179,12 @@ void
 KGDialog::slotShutdown()
 {
+        if (verify)
+                verify->suspend();
         if (_scheduledSd == SHUT_ALWAYS)
                 KDMShutdown::scheduleShutdown( this );
         else
                 KDMSlimShutdown( this ).exec();
+        if (verify)
+                verify->resume();
 }
 

--- kdebase/kdm/kfrontend/kgdialog.h  #1.9:1.10
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suit
 
 class QPopupMenu;
-class KConsole;
 class QGridLayout;
+class KConsole;
+class KGVerify;
 
 #define ex_exit    1
@@ -66,4 +67,5 @@ class KGDialog : public FDialog {
         bool needSep;
         QPopupMenu *optMenu;
+        KGVerify *verify;
 #ifdef WITH_KDM_XCONSOLE
         KConsole *consoleView;

--- kdebase/kdm/kfrontend/kgreeter.cpp  #1.135:1.136
@@ -107,5 +107,4 @@ KGreeter::KGreeter( bool framed )
   , userView( 0 )
   , userList( 0 )
-  , verify( 0 )
   , nNormals( 0 )
   , nSpecials( 0 )
@@ -361,33 +360,4 @@ KGreeter::insertSessions()
 
 void
-KGreeter::slotShutdown()
-{
-        verify->suspend();
-        inherited::slotShutdown();
-        verify->resume();
-}
-
-void
-KGreeter::slotConsole()
-{
-#ifdef HAVE_VTS
-        verify->suspend();
-#else
-        verify->abort();
-#endif
-        inherited::slotConsole();
-#ifdef HAVE_VTS
-        verify->resume();
-#endif
-}
-
-void
-KGreeter::slotExit()
-{
-        verify->abort();
-        inherited::slotExit();
-}
-
-void
 KGreeter::slotUserEntered()
 {

--- kdebase/kdm/kfrontend/kgreeter.h  #1.43:1.44
@@ -72,7 +72,4 @@ class KGreeter : public KGDialog, public
         void slotSessionSelected( int );
         void slotUserEntered();
-        void slotExit();
-        void slotShutdown();
-        void slotConsole();
 
   protected:
@@ -89,5 +86,4 @@ class KGreeter : public KGDialog, public
         UserListView *userView;
         QStringList *userList;
-        KGVerify *verify;
         QPopupMenu *sessMenu;
         QValueVector<SessType> sessionTypes;


[prev in list] [next in list] [prev in thread] [next in thread]