patch for deskguide-applet

[Christian Marillat <marillat christian wanadoo fr>]

Hi,

I forward this patch from a Debian user.

Christian

From: Doug Larrick <doug ties org>
Subject: Bug#78550: desk-guide applet does not display window contents
To: submit bugs debian org
Date: Fri, 01 Dec 2000 23:11:18 -0500 (EST)
Reply-To: doug ties org, 78550 bugs debian org
Resent-From: Doug Larrick <doug ties org>
X-Mailer: XFMail 1.4.4 on Linux

Package: gnome-applets
version: 1.2.4-1

On systems that, for one reason or other, are unable or unwilling to
allocate X shared memory for its use, deskguide_applet does not fill
its thumbnails with screen contents, regardless of the setting of the
Properties checkbox to that effect.  This problem affects at least
some Alpha systems using XFree86 3.3.6 under current Woody.

deskguide-applet contains code to deal with failure to allocate X
shared memory, but this code is not being properly triggered.  The
following patch to gnome-core-1.2.4/applets/desk-guide/gwmthumbnail.c
fixes the problem.


--- gwmthumbnail.c.orig Wed Nov 15 12:57:58 2000
+++ gwmthumbnail.c      Fri Dec  1 22:54:19 2000
@@ -553,6 +553,7 @@
   XShmSegmentInfo *x_shm_info;
   gint depth = -1;
   gint saved_gdk_use_xshm;
+  gint errcode;
 
   g_return_val_if_fail (width != 0 && height != 0, NULL);
   g_return_val_if_fail (pixmap_p != NULL, NULL);
@@ -585,8 +586,8 @@
                                       x_shm_info,
                                       width, height, depth);
   XSync (private->xdisplay, False);
-  gdk_error_trap_pop ();
-  if (!private->xwindow)
+  errcode = gdk_error_trap_pop ();
+  if (!private->xwindow || errcode != 0)
     {
       g_free (private);
       gdk_image_destroy (image);