summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJess VanDerwalker <washu@sonic.net>2012-07-19 11:28:31 -0700
committerJess VanDerwalker <washu@sonic.net>2012-07-25 09:57:46 -0700
commita89417b4e28b2cfe6a9a08e40b52a3a79c556490 (patch)
tree2a8c68205d5255863e0a08d75e9a5cff12b3c4ce /src
parent121553591d0aa8e5bcfd6e6a1e96ebf0736a1493 (diff)
xtoq: Commented out code that kills X server.
Commented out the code that kills the X server, since it is using a sledgehammer approach that kills *every* running instance of Xorg. Signed-off-by: Jess VanDerwalker <washu@sonic.net> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'src')
-rw-r--r--src/xtoq/XtoqController.m25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/xtoq/XtoqController.m b/src/xtoq/XtoqController.m
index 6b91972..371f88c 100644
--- a/src/xtoq/XtoqController.m
+++ b/src/xtoq/XtoqController.m
@@ -148,18 +148,19 @@
- (void)applicationWillTerminate:(NSNotification *)aNotification
{
xcwm_context_close(rootContext);
-
- const char *spawn[4];
- pid_t child;
-
- // FIXME: This clobbers all instantances of the xserver. Not what
- // we want to do.
- spawn[0] = "/usr/bin/killall";
- spawn[1] = "-9";
- spawn[2] = "Xorg";
- spawn[3] = NULL;
-
- posix_spawn(&child, spawn[0], NULL, NULL, (char *const *)spawn, environ);
+
+ // TODO: Implement decent server shutdown on app termination.
+ // FIXME: This way of closing the server creates more problems than its
+ // currently worth.
+ // const char *spawn[4];
+ // pid_t child;
+
+ // spawn[0] = "/usr/bin/killall";
+ // spawn[1] = "-9";
+ // spawn[2] = "Xorg";
+ // spawn[3] = NULL;
+
+ // posix_spawn(&child, spawn[0], NULL, NULL, (char *const *)spawn, environ);
}
- (void) applicationWillFinishLaunching: (NSNotification *) aNotification