* xterm.c: x_session_initialized new variable.

(x_term_init): Use x_session_initialized to check if
x_session_initialize should be called.
(x_initialize): Initialize x_session_initialized.

diff --git a/src/ChangeLog b/src/ChangeLog
index e208614b1560185a08fd949600f80fcf15b4d13a..d699b23f05927a1c1e55d1ec27cbec8924d5e4bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-21  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xterm.c: x_session_initialized new variable.
+       (x_term_init): Use x_session_initialized to check if
+       x_session_initialize should be called.
+       (x_initialize): Initialize x_session_initialized.
+
 2006-03-21  Kim F. Storm  <storm@cua.dk>
 
        * fringe.c (draw_fringe_bitmap): Don't calculate default overlay arrow

diff --git a/src/xterm.c b/src/xterm.c
index 298b1c2e63de1a1070c47cd3dd590ed4f97460cc..82f3565f6c4f4ced538ae2f56ced9349e6a226f9 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10039,6 +10039,10 @@ static XrmOptionDescRec emacs_options[] = {
 
 static int x_initialized;
 
+#ifdef HAVE_X_SM
+static int x_session_initialized;
+#endif
+
 #ifdef MULTI_KBOARD
 /* Test whether two display-name strings agree up to the dot that separates
    the screen number from the server number.  */
@@ -10607,7 +10611,7 @@ x_term_init (display_name, xrm_option, resource_name)
 
 #ifdef HAVE_X_SM
   /* Only do this for the first display.  */
-  if (x_initialized == 1)
+  if (!x_session_initialized++)
     x_session_initialize (dpyinfo);
 #endif
 
@@ -10792,6 +10796,9 @@ x_initialize ()
   last_tool_bar_item = -1;
   any_help_event_p = 0;
   ignore_next_mouse_click_timeout = 0;
+#ifdef HAVE_X_SM
+  x_session_initialized = 0;
+#endif
 
 #ifdef USE_GTK
   current_count = -1;