From 3764a3647224a5e9dde021828d3b17fe5fc9fdeb Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 30 Jun 2010 22:19:12 +0200
Subject: Properly parse and marshall SpiceString

---
 spice.proto | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'spice.proto')

diff --git a/spice.proto b/spice.proto
index 75282086..8df12387 100644
--- a/spice.proto
+++ b/spice.proto
@@ -564,12 +564,12 @@ struct String {
     string_flags flags; /* Special: Only one of a1/a4/a8 set */
     switch (flags) {
     case RASTER_A1:
-	RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph);
+	RasterGlyphA1 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
     case RASTER_A4:
-	RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph);
+	RasterGlyphA4 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
     case RASTER_A8:
-	RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph);
-    } u @end @nomarshal;
+	RasterGlyphA8 glyphs[length] @ctype(SpiceRasterGlyph) @ptr_array;
+    } u @anon;
 };
 
 channel DisplayChannel : BaseChannel {
@@ -727,7 +727,7 @@ channel DisplayChannel : BaseChannel {
     message {
 	DisplayBase base;
 	struct Text {
-	    String *str;
+	    String *str @marshall @nonnull;
 	    Rect back_area;
 	    Brush fore_brush @outvar(fore_brush);
 	    Brush back_brush @outvar(back_brush);
-- 
cgit