From 3bd0209d810a42c0279b302acf853119625b9903 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Mon, 14 Jan 2002 18:56:15 +0000
Subject: [PATCH] Mon Jan 14 13:51:49 2002                        Michael
 Jennings (mej)

Added a server grab around the setting of the root properties and
background.  Suggested by Owen Taylor <otaylor@redhat.com> and Olivier
Chapuis <olivier.chapuis@free.fr>.

Also updated the version number in configure.ac for all those
mor^H^H^Hpeople using Debian unstable. :-)  Fixed a few compiler
warnings too.


SVN revision: 5834
---
 ChangeLog        | 10 ++++++++++
 configure.ac     |  2 +-
 src/command.c    |  6 +++---
 utils/Esetroot.c |  3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e05e12b..e865e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4464,3 +4464,13 @@ Thu Jan  3 12:42:41 2002                        Michael Jennings (mej)
 
 This is better.
 ----------------------------------------------------------------------
+Mon Jan 14 13:51:49 2002                        Michael Jennings (mej)
+
+Added a server grab around the setting of the root properties and
+background.  Suggested by Owen Taylor <otaylor@redhat.com> and Olivier
+Chapuis <olivier.chapuis@free.fr>.
+
+Also updated the version number in configure.ac for all those
+mor^H^H^Hpeople using Debian unstable. :-)  Fixed a few compiler
+warnings too.
+----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a59461a..b8c7273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl# $Id: configure.in,v 1.56 2001/10/21 13:21:04 mej Exp $
 
 AC_INIT(src/feature.h)
-AM_INIT_AUTOMAKE(Eterm, 0.9.1)
+AM_INIT_AUTOMAKE(Eterm, 0.9.2)
 
 dnl# Set some basic variables
 DATE="`date '+%d %B %Y'`"
diff --git a/src/command.c b/src/command.c
index 2029207..1d5a338 100644
--- a/src/command.c
+++ b/src/command.c
@@ -2103,9 +2103,9 @@ run_command(char **argv)
   privileges(IGNORE);
 
   ptyfd = get_pty();
-  AT_LEAST(num_fds, ptyfd + 1);
   if (ptyfd < 0)
     return (-1);
+  AT_LEAST(num_fds, ((unsigned int) (ptyfd + 1)));
 
   /* store original tty status for restoration clean_exit() -- rgg 04/12/95 */
   lstat(ttydev, &ttyfd_stat);
@@ -2287,9 +2287,9 @@ init_command(char **argv)
   Xfd = XConnectionNumber(Xdisplay);
   D_CMD(("Xfd = %d\n", Xfd));
   cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
-  AT_LEAST(num_fds, Xfd + 1);
+  AT_LEAST((int) num_fds, Xfd + 1);
   if (pipe_fd >= 0) {
-    AT_LEAST(num_fds, pipe_fd + 1);
+    AT_LEAST((int) num_fds, pipe_fd + 1);
   }
 
   if ((cmd_fd = run_command(argv)) < 0) {
diff --git a/utils/Esetroot.c b/utils/Esetroot.c
index ae9c9e5..5fd529b 100644
--- a/utils/Esetroot.c
+++ b/utils/Esetroot.c
@@ -263,10 +263,11 @@ main(int argc, char *argv[])
     } else {
       XFillRectangle(Xdisplay, p, gc, x, y, scr->width, scr->height);
     }
+    XGrabServer(Xdisplay);
     set_pixmap_property(p);
-    XFlush(Xdisplay);
     XSetWindowBackgroundPixmap(Xdisplay, Xroot, p);
     XClearWindow(Xdisplay, Xroot);
+    XUngrabServer(Xdisplay);
     XFlush(Xdisplay);
   }
 #else