[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.805 emacs/src/xterm.c:1.806
*** emacs/src/xterm.c:1.805     Tue Aug 19 12:20:13 2003
--- emacs/src/xterm.c   Thu Aug 21 15:54:47 2003
***************
*** 10136,10142 ****
    if (!x_initialized)
      {
        x_initialize ();
!       x_initialized = 1;
      }
  
  #ifdef USE_GTK
--- 10136,10142 ----
    if (!x_initialized)
      {
        x_initialize ();
!       ++x_initialized;
      }
  
  #ifdef USE_GTK
***************
*** 10152,10159 ****
      if (x_initialized > 1)
        return 0;
  
-     x_initialized++;
- 
      for (argc = 0; argc < NUM_ARGV; ++argc)
        argv[argc] = 0;
  
--- 10152,10157 ----
***************
*** 10343,10348 ****
--- 10341,10347 ----
    dpyinfo->height = HeightOfScreen (dpyinfo->screen);
    dpyinfo->width = WidthOfScreen (dpyinfo->screen);
    dpyinfo->root_window = RootWindowOfScreen (dpyinfo->screen);
+   dpyinfo->client_leader_window = 0;
    dpyinfo->grabbed = 0;
    dpyinfo->reference_count = 0;
    dpyinfo->icon_bitmap_id = -1;
***************
*** 10412,10417 ****
--- 10411,10418 ----
      = XInternAtom (dpyinfo->display, "WM_CONFIGURE_DENIED", False);
    dpyinfo->Xatom_wm_window_moved
      = XInternAtom (dpyinfo->display, "WM_MOVED", False);
+   dpyinfo->Xatom_wm_client_leader
+     = XInternAtom (dpyinfo->display, "WM_CLIENT_LEADER", False);
    dpyinfo->Xatom_editres
      = XInternAtom (dpyinfo->display, "Editres", False);
    dpyinfo->Xatom_CLIPBOARD
***************
*** 10566,10571 ****
--- 10567,10578 ----
  #endif
    }
  
+ #ifdef HAVE_X_SM
+   /* Only do this for the first display.  */
+   if (x_initialized == 1)
+     x_session_initialize (dpyinfo);
+ #endif
+ 
    UNBLOCK_INPUT;
  
    return dpyinfo;
***************
*** 10779,10788 ****
  #endif /* SIGWINCH */
  
    signal (SIGPIPE, x_connection_signal);
- 
- #ifdef HAVE_X_SM
-   x_session_initialize ();
- #endif
  }
  
  
--- 10786,10791 ----