comparison src/xterm.c @ 83558:8e46638e99c7

Re-enable GTK multidisplay support. * configure.in (HAVE_GTK_MULTIDISPLAY): Remove override. * configure: Regenerate. * xterm.c (x_term_init): Reword error string for GTK. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-598
author Karoly Lorentey <karoly@lorentey.hu>
date Sat, 24 Feb 2007 20:29:24 +0000
parents 07774e5c3ff5
children 738ce3540ffb
comparison
equal deleted inserted replaced
83557:8aaa2a0d400f 83558:8e46638e99c7
10564 #ifdef HAVE_GTK_MULTIDISPLAY 10564 #ifdef HAVE_GTK_MULTIDISPLAY
10565 /* Opening another display. If xg_display_open returns less 10565 /* Opening another display. If xg_display_open returns less
10566 than zero, we are probably on GTK 2.0, which can only handle 10566 than zero, we are probably on GTK 2.0, which can only handle
10567 one display. GTK 2.2 or later can handle more than one. */ 10567 one display. GTK 2.2 or later can handle more than one. */
10568 if (xg_display_open (SDATA (display_name), &dpy) < 0) 10568 if (xg_display_open (SDATA (display_name), &dpy) < 0)
10569 #endif
10569 error ("Sorry, this version of GTK can only handle one display"); 10570 error ("Sorry, this version of GTK can only handle one display");
10570 #else
10571 /* XXX Unfortunately, multiple display support is severely broken
10572 in recent GTK versions, so HAVE_GTK_MULTIDISPLAY is
10573 unconditionally disabled in configure.in. */
10574 error ("Sorry, multiple display support is broken in current GTK versions");
10575 #endif
10576 } 10571 }
10577 else 10572 else
10578 { 10573 {
10579 for (argc = 0; argc < NUM_ARGV; ++argc) 10574 for (argc = 0; argc < NUM_ARGV; ++argc)
10580 argv[argc] = 0; 10575 argv[argc] = 0;