[Spice-devel] [spice-server 06/10] Remove Drawable::group_id

[Christophe Fergeau]

We can now directly get it from RedDrawable.
---
 server/dcc.c             | 2 +-
 server/display-channel.c | 1 -
 server/display-channel.h | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/dcc.c b/server/dcc.c
index bd25069..abf3c0d 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -657,7 +657,7 @@ static RedGlzDrawable *get_glz_drawable(DisplayChannelClient *dcc, Drawable *dra
     ret->dcc = dcc;
     ret->red_drawable = red_drawable_ref(drawable->red_drawable);
     ret->drawable = drawable;
-    ret->group_id = drawable->group_id;
+    ret->group_id = drawable->red_drawable->release_info_ext.group_id;
     ret->instances_count = 0;
     ring_init(&ret->instances);
 
diff --git a/server/display-channel.c b/server/display-channel.c
index 2d6abd4..bae0dcc 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -1379,7 +1379,6 @@ Drawable *display_channel_drawable_try_new(DisplayChannel *display,
     ring_init(&drawable->pipes);
     ring_init(&drawable->glz_ring);
     drawable->process_commands_generation = process_commands_generation;
-    drawable->group_id = group_id;
 
     return drawable;
 }
diff --git a/server/display-channel.h b/server/display-channel.h
index 49f1a4f..24d83a3 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -73,7 +73,6 @@ struct Drawable {
     Stream *sized_stream;
     int streamable;
     BitmapGradualType copy_bitmap_graduality;
-    uint32_t group_id;
     DependItem depend_items[3];
 
     int surface_id;
-- 
2.5.0