diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
| commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kdm/backend/dm.c | |
| parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
| download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm/backend/dm.c')
| -rw-r--r-- | kdm/backend/dm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c index d54cccb87..a372686df 100644 --- a/kdm/backend/dm.c +++ b/kdm/backend/dm.c @@ -288,11 +288,11 @@ main( int argc, char **argv ) LogError( "Failed to execute shutdown command %\"s\n", cmd ); exit( 1 ); } else { - sigset_t tqmask; - sigemptyset( &tqmask ); - sigaddset( &tqmask, SIGCHLD ); - sigaddset( &tqmask, SIGHUP ); - sigsuspend( &tqmask ); + sigset_t mask; + sigemptyset( &mask ); + sigaddset( &mask, SIGCHLD ); + sigaddset( &mask, SIGHUP ); + sigsuspend( &mask ); } } Debug( "nothing left to do, exiting\n" ); @@ -997,8 +997,8 @@ ReapChildren( void ) /* don't kill again */ break; case running: - if (startingServer == d && d->servertqStatus != ignore) { - if (d->servertqStatus == starting && waitCode( status ) != 47) + if (startingServer == d && d->serverStatus != ignore) { + if (d->serverStatus == starting && waitCode( status ) != 47) LogError( "X server died during startup\n" ); StartServerFailed(); break; @@ -1183,7 +1183,7 @@ MainLoop( void ) break; case SIGUSR1: if (startingServer && - startingServer->servertqStatus == starting) + startingServer->serverStatus == starting) StartServerSuccess(); break; } @@ -1214,7 +1214,7 @@ MainLoop( void ) } static void -CheckDisplaytqStatus( struct display *d ) +CheckDisplayStatus( struct display *d ) { if ((d->displayType & d_origin) == dFromFile && !d->stillThere) StopDisplay( d ); @@ -1235,7 +1235,7 @@ KickDisplay( struct display *d ) { if (d->status == notRunning) StartDisplay( d ); - if (d->servertqStatus == awaiting && !startingServer) + if (d->serverStatus == awaiting && !startingServer) StartServer( d ); } @@ -1314,7 +1314,7 @@ AllocateVT( struct display *d ) static void StartDisplays( void ) { - ForEachDisplay( CheckDisplaytqStatus ); + ForEachDisplay( CheckDisplayStatus ); CloseGetter(); #ifdef HAVE_VTS active_vts = -1; @@ -1356,7 +1356,7 @@ StartDisplay( struct display *d ) kill( d->serverPid, d->resetSignal ); } if (d->serverPid == -1) { - d->servertqStatus = awaiting; + d->serverStatus = awaiting; return; } } else { |