? averager.c
? fix
? gdkanimation.c
? x11/birnan
? x11/crack
Index: gdkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
retrieving revision 1.164
diff -u -p -u -r1.164 gdkwindow.c
--- gdkwindow.c	21 Nov 2004 16:24:00 -0000	1.164
+++ gdkwindow.c	22 Dec 2004 17:22:54 -0000
@@ -2168,32 +2168,20 @@ gdk_window_process_updates_internal (Gdk
 				window_region);
 	  gdk_region_destroy (window_region);
 	  
-	  if (!gdk_region_empty (expose_region))
+	  if (!gdk_region_empty (expose_region) &&
+	      (private->event_mask & GDK_EXPOSURE_MASK))
 	    {
-	      if (private->event_mask & GDK_EXPOSURE_MASK)
-		{
-		  GdkEvent event;
+	      GdkEvent event;
 	      
-		  event.expose.type = GDK_EXPOSE;
-		  event.expose.window = g_object_ref (window);
-		  event.expose.count = 0;
-		  event.expose.region = expose_region;
-		  gdk_region_get_clipbox (expose_region, &event.expose.area);
-		  
-		  (*_gdk_event_func) (&event, _gdk_event_data);
-
-		  g_object_unref (window);
-		}
-	      else
-		{
-		  /* Windows without GDK_EXPOSURE_MASK still need to
-		   * get their backgrounds painted, because it
-		   * may have been temporarily set to None when
-		   * the expose was generated
-		   */
-		  gdk_window_begin_paint_region (window, expose_region);
-		  gdk_window_end_paint (window);
-		}
+	      event.expose.type = GDK_EXPOSE;
+	      event.expose.window = g_object_ref (window);
+	      event.expose.count = 0;
+	      event.expose.region = expose_region;
+	      gdk_region_get_clipbox (expose_region, &event.expose.area);
+	      
+	      (*_gdk_event_func) (&event, _gdk_event_data);
+	      
+	      g_object_unref (window);
 	    }
 
 	  if (expose_region != update_area)
Index: x11/gdkwindow-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.c,v
retrieving revision 1.227
diff -u -p -u -r1.227 gdkwindow-x11.c
--- x11/gdkwindow-x11.c	17 Nov 2004 00:55:10 -0000	1.227
+++ x11/gdkwindow-x11.c	22 Dec 2004 17:22:54 -0000
@@ -236,6 +236,13 @@ tmp_unset_bg (GdkWindow *window)
   obj = (GdkWindowObject *) window;
   impl = GDK_WINDOW_IMPL_X11 (obj->impl);
 
+  /* For windows without EXPOSURE_MASK, we can't do this
+   * unsetting because such windows depend on the drawing
+   * that the X server is going to do
+   */
+  if (!(obj->event_mask & GDK_EXPOSURE_MASK))
+    return;
+    
   impl->position_info.no_bg = TRUE;
 
   if (obj->bg_pixmap != GDK_NO_BG)
@@ -252,6 +259,9 @@ tmp_reset_bg (GdkWindow *window)
   obj = (GdkWindowObject *) window;
   impl = GDK_WINDOW_IMPL_X11 (obj->impl);
 
+  if (!(obj->event_mask & GDK_EXPOSURE_MASK))
+    return;
+    
   impl->position_info.no_bg = FALSE;
 
   if (obj->bg_pixmap == GDK_NO_BG)
@@ -1107,7 +1117,6 @@ gdk_toplevel_x11_free_contents (GdkDispl
       toplevel->update_counter = None;
 
       XSyncIntToValue (&toplevel->current_counter_value, 0);
-      XSyncIntToValue (&toplevel->pending_counter_value, 0);
     }
 #endif
 }
