aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-06-30 17:10:26 +0000
committerdos-reis <gdr@axiomatics.org>2011-06-30 17:10:26 +0000
commit6d9346504475521b727963744a35ca76c4a2622c (patch)
tree17331ff2030b917f26c988e29fd0b990b3ffb920 /src
parentd0bec2870ff52e6c8ea8a0e6ce4e9da354b88104 (diff)
downloadopen-axiom-6d9346504475521b727963744a35ca76c4a2622c.tar.gz
* sman/sman.c (main): Don't start Hyperdoc if no X11 server is running.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/sman/sman.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b78d0b3..b1ec2b77 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * sman/sman.c (main): Don't start Hyperdoc if no X11 server is running.
+
+2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* interp/modemap.boot: Cleanup inactive codes.
2011-06-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/sman/sman.c b/src/sman/sman.c
index b1fe4a0d..be21226d 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -776,7 +776,8 @@ main(int argc, char *argv[])
start_the_session_manager();
if (start_spadclient) start_the_spadclient();
if (start_local_spadclient) start_the_local_spadclient();
- if (start_ht) start_the_hypertex();
+ if (start_ht and in_X())
+ start_the_hypertex();
if (start_graphics and in_X())
start_the_graphics();
openaxiom_sleep(1);