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

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-01 19:30:37
Message-ID: 20050201193037.C9A171CFF9 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

remove AUTO_RESERVE


  M +0 -7      ctrl.c   2.31
  M +1 -11     dm.c   1.107
  M +0 -3      dm.h   1.94
  M +0 -36     dpylist.c   1.34
  M +0 -4      session.c   1.114


--- kdebase/kdm/backend/ctrl.c  #2.30:2.31
@@ -729,15 +729,8 @@ processCtrl( const char *string, int len
                                         goto exce;
                                 d->hstent->lock = 1;
-#ifdef AUTO_RESERVE
-                                if (AllLocalDisplaysLocked( 0 ))
-                                        StartReserveDisplay( 0 );
-#endif
                         } else if (!strcmp( ar[0], "unlock" )) {
                                 if (ar[1])
                                         goto exce;
                                 d->hstent->lock = 0;
-#ifdef AUTO_RESERVE
-                                ReapReserveDisplays();
-#endif
                         } else if (!strcmp( ar[0], "suicide" )) {
                                 if (ar[1])

--- kdebase/kdm/backend/dm.c  #1.106:1.107
@@ -846,18 +846,8 @@ ReapChildren( void )
                                 break;
 #endif
-#ifdef AUTO_RESERVE
-                        case EX_RESERVE:
-                                Debug( "display exited with EX_RESERVE\n" );
-                                ExitDisplay( d, DS_RESERVE, 0, 0 );
-                                break;
-#endif
                         case EX_NORMAL:
                                 /* (any type of) session ended */
                                 Debug( "display exited with EX_NORMAL\n" );
-                                if ((d->displayType & d_lifetime) == dReserve
-#ifdef AUTO_RESERVE
-                                    && !AllLocalDisplaysLocked( d )
-#endif
-                                   )
+                                if ((d->displayType & d_lifetime) == dReserve)
                                         ExitDisplay( d, DS_RESERVE, 0, 0 );
                                 else

--- kdebase/kdm/backend/dm.h  #1.93:1.94
@@ -651,6 +651,3 @@ void sessreg( struct display *d, int pid
 #endif /* XDMCP */
 
-/* automatically fork off reserve display if all displays are locked */
-/*#define AUTO_RESERVE 1*/
-
 #endif /* _DM_H_ */

--- kdebase/kdm/backend/dpylist.c  #1.33:1.34
@@ -99,40 +99,4 @@ idleReserveDisplays( void )
 }
 
-#ifdef AUTO_RESERVE
-int
-AllLocalDisplaysLocked( struct display *dp )
-{
-        struct display *d;
-
-        for (d = displays; d; d = d->next)
-                if (d != dp &&
-                    (d->displayType & d_location) == dLocal &&
-                    d->status == running && !d->hstent->lock)
-                        return 0;
-        return 1;
-}
-
-void
-ReapReserveDisplays( void )
-{
-        struct display *d, *rd;
-
-        for (rd = 0, d = displays; d; d = d->next)
-                if ((d->displayType & d_location) == dLocal && d->status == running &&
-                    !d->hstent->lock)
-                {
-                        if (rd) {
-                                rd->idleTimeout = 0;
-                                if (rd->pid != -1)
-                                        kill( rd->pid, SIGALRM );
-                                rd = 0;
-                        }
-                        if ((d->displayType & d_lifetime) == dReserve &&
-                            d->userSess < 0)
-                                rd = d;
-                }
-}
-#endif /* AUTO_RESERVE */
-
 int
 StartReserveDisplay( int lt )

--- kdebase/kdm/backend/session.c  #1.113:1.114
@@ -575,9 +575,5 @@ ManageSession( struct display *d )
                 if (Setjmp( idleTOJmp )) {
                         CloseGreeter( TRUE );
-#ifdef AUTO_RESERVE
-                        SessionExit( EX_RESERVE );
-#else
                         SessionExit( EX_NORMAL );
-#endif
                 }
                 Signal( SIGALRM, IdleTOJmp );


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