[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 20:01:04
Message-ID: 20050201200104.690F31BB8B () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

make unused displays go away when their config changed from permanent to
reserve.


  M +8 -3      dm.c   1.108


--- kdebase/kdm/backend/dm.c  #1.107:1.108
@@ -953,7 +953,8 @@ ReapChildren( void )
                                 break;
                         case remoteLogin:
-                                Debug( "remote login X server for display %s exited,"
-                                       " restarting display\n", d->name );
-                                d->status = notRunning;
+                                Debug( "remote login X server for display %s exited\n",
+                                       d->name );
+                                d->status = ((d->displayType & d_lifetime) == dReserve) ?
+                                            reserve : notRunning;
                                 break;
                         case raiser:
@@ -1184,4 +1185,7 @@ CheckDisplayStatus( struct display *d )
         if ((d->displayType & d_origin) == dFromFile && !d->stillThere)
                 StopDisplay( d );
+        else if ((d->displayType & d_lifetime) == dReserve &&
+                 d->status == running && d->userSess < 0 && !d->idleTimeout)
+                rStopDisplay( d, DS_RESERVE );
 }
 
@@ -1387,4 +1391,5 @@ rStopDisplay( struct display *d, int end
         Debug( "stopping display %s to state %d\n", d->name, endState );
         AbortStartServer( d );
+        d->idleTimeout = 0;
         if (d->serverPid != -1 || d->pid != -1) {
                 if (d->pid != -1)


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