? gtk+/.ChangeLog.rej.swp
Index: gtk+//ChangeLog
===================================================================
RCS file: /export/cvs/gnome-2.0/gtk+/ChangeLog,v
retrieving revision 1.33
diff -p -u -5 -r1.33 ChangeLog
--- gtk+//ChangeLog	2002/04/18 21:26:38	1.33
+++ gtk+//ChangeLog	2002/04/19 06:27:34
@@ -1,5 +1,12 @@
+Fri Apr 19 12:22:32 2002  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap): If the pixmap's
+	depth doesnt match with the window depth, then do not set the
+	background pixmap. If we do, it results in a BadMatch X Window System
+	error. Fix for #78061
+
 2002-04-18  Tor Lillqvist  <tml@iki.fi>
 
 	* gdk-pixbuf/Makefile.am (uninstall-libtool-import-lib)
 	* gdk/Makefile.am (uninstall-libtool-import-lib): Fix typo,
 	thanks to David Sterba for noticing.
Index: gtk+//gdk/x11/gdkwindow-x11.c
===================================================================
RCS file: /export/cvs/gnome-2.0/gtk+/gdk/x11/gdkwindow-x11.c,v
retrieving revision 1.4
diff -p -u -5 -r1.4 gdkwindow-x11.c
--- gtk+//gdk/x11/gdkwindow-x11.c	2002/04/11 23:50:02	1.4
+++ gtk+//gdk/x11/gdkwindow-x11.c	2002/04/19 06:27:34
@@ -2031,10 +2031,18 @@ gdk_window_set_back_pixmap (GdkWindow *w
   
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (pixmap == NULL || !parent_relative);
 
+  if (pixmap != NULL)
+    {
+      gint window_depth = gdk_drawable_get_depth (window);
+      gint pixmap_depth = gdk_drawable_get_depth (pixmap);
+
+      g_return_if_fail (window_depth != pixmap_depth);
+    }
+
   if (private->bg_pixmap &&
       private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
       private->bg_pixmap != GDK_NO_BG)
     gdk_pixmap_unref (private->bg_pixmap);
 
