Tue Jan 18 13:46:46 2005 Manish Singh <yosh@gimp.org

        * gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
        disambiguate nested if/else.

ChangeLog

+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:

ChangeLog.pre-2-10

+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:

ChangeLog.pre-2-8

+Tue Jan 18 13:46:46 2005  Manish Singh  <yosh@gimp.org
+
+	* gdk/x11/gdkdrawable-x11.c (_gdk_x11_have_render_with_trapezoids):
+	disambiguate nested if/else.
+
 2005-01-18  Federico Mena Quintero  <federico@ximian.com>
 
 	Merged from gtk-2-6:

gdk/x11/gdkdrawable-x11.c

@@ -328,25 +328,27 @@ _gdk_x11_have_render_with_trapezoids (GdkDisplay *display)
   GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display);
 
   if (x11display->have_render_with_trapezoids == GDK_UNKNOWN)
-    if (!_gdk_x11_have_render (display))
-      x11display->have_render_with_trapezoids = GDK_NO;
-    else
-      {
-	/*
-	 * Require protocol >= 0.4 for CompositeTrapezoids support.
-	 */
-	int major_version, minor_version;
+    {
+      if (!_gdk_x11_have_render (display))
+	x11display->have_render_with_trapezoids = GDK_NO;
+      else
+	{
+	  /*
+	   * Require protocol >= 0.4 for CompositeTrapezoids support.
+	   */
+	  int major_version, minor_version;
 	
 #define XRENDER_TETRAPEZOIDS_MAJOR 0
 #define XRENDER_TETRAPEZOIDS_MINOR 4
 	
-	if (XRenderQueryVersion (xdisplay, &major_version,
-				 &minor_version))
-	  if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
-	      ((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
-		 (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
-	    x11display->have_render_with_trapezoids = GDK_NO;
-      }
+	  if (XRenderQueryVersion (xdisplay, &major_version,
+				   &minor_version))
+	    if ((major_version < XRENDER_TETRAPEZOIDS_MAJOR) ||
+		((major_version == XRENDER_TETRAPEZOIDS_MAJOR) &&
+		   (minor_version < XRENDER_TETRAPEZOIDS_MINOR)))
+	      x11display->have_render_with_trapezoids = GDK_NO;
+	}
+    }
 
   return x11display->have_render_with_trapezoids == GDK_YES;
 }