[Emacs-diffs] trunk r117816: * xsmfns.c: Initialize ice_fd.

[Jan D.]

------------------------------------------------------------
revno: 117816
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18375
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2014-09-04 07:38:37 +0200
message:
  * xsmfns.c: Initialize ice_fd.
  
  * xterm.c (x_term_init): Don't call x_session_initialize if running
  as a daemon.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xsmfns.c                   xsmfns.c-20091113204419-o5vbwnq5f7feedwu-2385
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-04 02:15:56 +0000
+++ b/src/ChangeLog     2014-09-04 05:38:37 +0000
@@ -1,3 +1,10 @@
+2014-09-04  Jan D  <address@hidden>
+
+       * xterm.c (x_term_init): Don't call x_session_initialize if running
+       as a daemon (Bug#18375).
+
+       * xsmfns.c: Initialize ice_fd.
+
 2014-09-04  Paul Eggert  <address@hidden>
 
        Less chatter in 'make' output.

=== modified file 'src/xsmfns.c'
--- a/src/xsmfns.c      2014-04-05 19:30:36 +0000
+++ b/src/xsmfns.c      2014-09-04 05:38:37 +0000
@@ -49,7 +49,7 @@
 
 /* The descriptor that we use to check for data from the session manager.  */
 
-static int ice_fd;
+static int ice_fd = -1;
 
 /* A flag that says if we are in shutdown interactions or not.  */
 

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-08-28 18:33:18 +0000
+++ b/src/xterm.c       2014-09-04 05:38:37 +0000
@@ -11183,8 +11183,8 @@
 #ifdef HAVE_X_SM
   /* Only do this for the very first display in the Emacs session.
      Ignore X session management when Emacs was first started on a
-     tty.  */
-  if (terminal->id == 1)
+     tty or started as a daemon.  */
+  if (terminal->id == 1 && ! IS_DAEMON)
     x_session_initialize (dpyinfo);
 #endif