From bc1c2837f38a3f0f2cb45697b63e756506d5653f Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 23 Jun 2010 08:53:04 +0200
Subject: [PATCH] qxl abi: parse QXLFill.

Also adapt to tyops fix (s/rop_decriptor/rop_descriptor/).
---
 common/canvas_base.c | 2 +-
 common/gl_canvas.c   | 2 +-
 spice.proto          | 2 +-
 spice1.proto         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/canvas_base.c b/common/canvas_base.c
index 700fcb4..68ea1a6 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -2200,7 +2200,7 @@ static void canvas_draw_fill(SpiceCanvas *spice_canvas, SpiceRect *bbox, SpiceCl
     canvas_mask_pixman(canvas, &dest_region, &fill->mask,
                        bbox->left, bbox->top);
 
-    rop = ropd_descriptor_to_rop(fill->rop_decriptor,
+    rop = ropd_descriptor_to_rop(fill->rop_descriptor,
                                  ROP_INPUT_BRUSH,
                                  ROP_INPUT_DEST);
 
diff --git a/common/gl_canvas.c b/common/gl_canvas.c
index b16f25f..2773eda 100644
--- a/common/gl_canvas.c
+++ b/common/gl_canvas.c
@@ -347,7 +347,7 @@ static void gl_canvas_draw_fill(SpiceCanvas *spice_canvas, SpiceRect *bbox, Spic
     set_clip(canvas, bbox, clip);
     set_mask(canvas, &fill->mask, bbox->left, bbox->top);
     set_brush(canvas, &fill->brush);
-    set_op(canvas, fill->rop_decriptor);
+    set_op(canvas, fill->rop_descriptor);
     SET_GLC_RECT(&rect, bbox);
 
     glc_fill_rect(canvas->glc, &rect);
diff --git a/spice.proto b/spice.proto
index 1aa2788..f2a1903 100644
--- a/spice.proto
+++ b/spice.proto
@@ -651,7 +651,7 @@ channel DisplayChannel : BaseChannel {
 	DisplayBase base;
 	struct Fill {
 	    Brush brush @outvar(brush);
-	    uint16 rop_decriptor;
+	    uint16 rop_descriptor;
 	    QMask mask @outvar(mask);
 	} data;
     } draw_fill = 302;
diff --git a/spice1.proto b/spice1.proto
index dbe57b5..90a2c30 100644
--- a/spice1.proto
+++ b/spice1.proto
@@ -600,7 +600,7 @@ channel DisplayChannel : BaseChannel {
 	DisplayBase base;
 	struct Fill {
 	    Brush brush @outvar(brush);
-	    uint16 rop_decriptor;
+	    uint16 rop_descriptor;
 	    QMask mask @outvar(mask);
 	} data;
     } draw_fill = 302;