comparison src/xterm.c @ 83410:fea405284011

Prevent core dumps with GTK by disabling secondary X connections there. * src/xterm.c (x_term_init) [!HAVE_GTK_MULTIDISPLAY]: Refuse to create secondary X connections. * configure.in (HAVE_GTK_MULTIDISPLAY): Disable test, unconditionally undefine. * configure: Regenerate. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-450

83409:be1f74bffc1d

    int argc;
    char *argv[NUM_ARGV];
    char **argv2 = argv;
    GdkAtom atom;

    if (x_initialized++ > 1)
      {
        /* Opening another display.  If xg_display_open returns less
           than zero, we are probably on GTK 2.0, which can only handle
           one display.  GTK 2.2 or later can handle more than one.  */
        if (xg_display_open (SDATA (display_name), &dpy) < 0)
          error ("Sorry, this version of GTK can only handle one display");
     }
    else
      {
        for (argc = 0; argc < NUM_ARGV; ++argc)
          argv[argc] = 0;

83410:fea405284011

    int argc;
    char *argv[NUM_ARGV];
    char **argv2 = argv;
    GdkAtom atom;

#ifndef HAVE_GTK_MULTIDISPLAY
    if (!EQ (Vinitial_window_system, intern ("x")))
      error ("Sorry, you cannot connect to X servers with the GTK toolkit");
#endif

    if (x_initialized++ > 1)
      {
#ifdef HAVE_GTK_MULTIDISPLAY
        /* Opening another display.  If xg_display_open returns less
           than zero, we are probably on GTK 2.0, which can only handle
           one display.  GTK 2.2 or later can handle more than one.  */
        if (xg_display_open (SDATA (display_name), &dpy) < 0)
          error ("Sorry, this version of GTK can only handle one display");
#else
        /* XXX Unfortunately, multiple display support is severely broken
           in recent GTK versions, so HAVE_GTK_MULTIDISPLAY is
           unconditionally disabled in configure.in.  */
        error ("Sorry, multiple display support is broken in current GTK versions");
#endif
      }
    else
      {
        for (argc = 0; argc < NUM_ARGV; ++argc)
          argv[argc] = 0;