summaryrefslogtreecommitdiffstats
path: root/kdm/backend/dm.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kdm/backend/dm.h
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-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.h')
-rw-r--r--kdm/backend/dm.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
index f73f68e10..c05d4c865 100644
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
@@ -181,11 +181,11 @@ typedef struct GProc {
int pid;
} GProc;
-typedef enum displaytqStatus { notRunning = 0, running, zombie, phoenix, raiser,
- textMode, reserve, remoteLogin } DisplaytqStatus;
+typedef enum displayStatus { notRunning = 0, running, zombie, phoenix, raiser,
+ textMode, reserve, remoteLogin } DisplayStatus;
-typedef enum servertqStatus { ignore = 0, awaiting, starting,
- terminated, killed, pausing } ServertqStatus;
+typedef enum serverStatus { ignore = 0, awaiting, starting,
+ terminated, killed, pausing } ServerStatus;
typedef struct RcStr {
struct RcStr *next;
@@ -241,7 +241,7 @@ struct display {
CfgArr cfg; /* config data array */
/* display state */
- DisplaytqStatus status; /* current status */
+ DisplayStatus status; /* current status */
int zstatus; /* substatus while zombie */
int pid; /* process id of child */
int serverPid; /* process id of server (-1 if none) */
@@ -249,7 +249,7 @@ struct display {
int serverVT; /* server VT (0 = none, -1 = pending) */
struct display *follower; /* on exit, hand VT to this display */
#endif
- ServertqStatus servertqStatus; /* X server startup state */
+ ServerStatus serverStatus; /* X server startup state */
Time_t lastStart; /* time of last display start */
int startTries; /* current start try */
int stillThere; /* state during HUP processing */