* xterm.c (x_term_init): For GTK part, increase x_initialized

  to check for more than one display.  Use error instead of return 0.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05d375e5da3082d24c886111dbb543b62d0769e0..88399d1ae17b418fbeeb80f6370e4d231df0feb0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_term_init): For GTK part, increase x_initialized
+       to check for more than one display.  Use error instead of return 0.
+
 2003-10-31  Andrew Choi  <akochoi@shaw.ca>
 
        * unexmacosx.c (unrelocate): New function (contributed by Nozomu

diff --git a/src/xterm.c b/src/xterm.c
index c686824a00353e83badb2bad4f8e2999b73656c4..5b76ba8405942a59f879f3f94e5a9798c7c518f7 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10204,7 +10204,8 @@ x_term_init (display_name, xrm_option, resource_name)
     /* GTK 2.0 can only handle one display, GTK 2.2 can handle more
        than one, but this remains to be implemented.  */
     if (x_initialized > 1)
-      return 0;
+      error("Sorry, the GTK port can only handle one display.");
+    ++x_initialized;
 
     for (argc = 0; argc < NUM_ARGV; ++argc)
       argv[argc] = 0;