[cairo-commit] gtkcairo/gtkcairo gdkcairo.c,1.15,1.16

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/gtkcairo/gtkcairo
In directory gabe:/tmp/cvs-serv32187/gtkcairo

Modified Files:
	gdkcairo.c 
Log Message:

2005-10-08  Carl Worth  <cworth at cworth.org>

        Port to latest glitz (thanks to sunmoon1997 <sunmoon1997 at gmail.com>)

        * configure.in: Require glitz 0.5.0 or newer.

        * gtkcairo/gdkcairo.c: (gdkcairo_realize),
        (gdkcairo_size_allocate): Track glitz API changes.


Index: gdkcairo.c
===================================================================
RCS file: /cvs/cairo/gtkcairo/gtkcairo/gdkcairo.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gdkcairo.c	7 Aug 2005 22:57:09 -0000	1.15
+++ gdkcairo.c	9 Oct 2005 02:38:04 -0000	1.16
@@ -181,9 +181,6 @@
         GTKCAIRO_GL_DOUBLEBUFFER = getenv ("GTKCAIRO_GL_DOUBLEBUFFER");
         GTKCAIRO_GL_SAMPLES = getenv ("GTKCAIRO_GL_SAMPLES");
 
-        templ.types.window = 1;
-        mask = GLITZ_FORMAT_WINDOW_MASK;
-
         if (GTKCAIRO_GL_DOUBLEBUFFER)
           {
             if (atoi (GTKCAIRO_GL_DOUBLEBUFFER))
@@ -206,7 +203,7 @@
           }
 
         dformat =
-          glitz_glx_find_drawable_format (dpy, screen, mask, &templ, 0);
+          glitz_glx_find_window_format (dpy, screen, mask, &templ, 0);
 
         if (dformat)
           {
@@ -248,7 +245,7 @@
                                   drawable,
                                   (dformat->doublebuffer) ?
                                   GLITZ_DRAWABLE_BUFFER_BACK_COLOR :
-                                  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR, 0, 0);
+                                  GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
 
             glitz_drawable_destroy (drawable);
 
@@ -320,7 +317,7 @@
                                     drawable,
                                     (dformat->doublebuffer) ?
                                     GLITZ_DRAWABLE_BUFFER_BACK_COLOR :
-                                    GLITZ_DRAWABLE_BUFFER_FRONT_COLOR, 0, 0);
+                                    GLITZ_DRAWABLE_BUFFER_FRONT_COLOR);
 
               cr_surface = cairo_glitz_surface_create (self->glitz_surface);
               self->cr = cairo_create (cr_surface);