diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-10-01 17:12:46 +0200 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:41 +0100 |
| commit | de7bcca7c5ce0f56b8d554d0957db17ff6233a2a (patch) | |
| tree | ed536545871667d9c88fae953f5c40bbf7927a04 | |
| parent | cf3e598b1d8c288816f2d137762d9dfc910c8d5c (diff) | |
| download | spice-de7bcca7c5ce0f56b8d554d0957db17ff6233a2a.tar.gz spice-de7bcca7c5ce0f56b8d554d0957db17ff6233a2a.tar.xz spice-de7bcca7c5ce0f56b8d554d0957db17ff6233a2a.zip | |
display: fix generate_uid name
| -rw-r--r-- | server/dcc-send.c | 2 | ||||
| -rw-r--r-- | server/display-channel.c | 4 | ||||
| -rw-r--r-- | server/display-channel.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/server/dcc-send.c b/server/dcc-send.c index d5d2df2f..7983ed20 100644 --- a/server/dcc-send.c +++ b/server/dcc-send.c @@ -1924,7 +1924,7 @@ static void red_marshall_image(RedChannelClient *rcc, SpiceMarshaller *m, ImageI spice_assert(rcc && display && item); worker = display->common.worker; - QXL_SET_IMAGE_ID(&red_image, QXL_IMAGE_GROUP_RED, generate_uid(display)); + QXL_SET_IMAGE_ID(&red_image, QXL_IMAGE_GROUP_RED, display_channel_generate_uid(display)); red_image.descriptor.type = SPICE_IMAGE_TYPE_BITMAP; red_image.descriptor.flags = item->image_flags; red_image.descriptor.width = item->width; diff --git a/server/display-channel.c b/server/display-channel.c index edd2ed37..38116f74 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -1,6 +1,6 @@ #include "display-channel.h" -uint32_t generate_uid(DisplayChannel *display) +uint32_t display_channel_generate_uid(DisplayChannel *display) { spice_return_val_if_fail(display != NULL, 0); @@ -967,7 +967,7 @@ static void handle_self_bitmap(DisplayChannel *display, Drawable *drawable) image = spice_new0(SpiceImage, 1); image->descriptor.type = SPICE_IMAGE_TYPE_BITMAP; image->descriptor.flags = 0; - QXL_SET_IMAGE_ID(image, QXL_IMAGE_GROUP_RED, generate_uid(display)); + QXL_SET_IMAGE_ID(image, QXL_IMAGE_GROUP_RED, display_channel_generate_uid(display)); image->u.bitmap.flags = surface->context.top_down ? SPICE_BITMAP_FLAGS_TOP_DOWN : 0; image->u.bitmap.format = spice_bitmap_from_surface_type(surface->context.format); image->u.bitmap.stride = dest_stride; diff --git a/server/display-channel.h b/server/display-channel.h index 33024549..26020b2f 100644 --- a/server/display-channel.h +++ b/server/display-channel.h @@ -420,7 +420,6 @@ static inline void region_add_clip_rects(QRegion *rgn, SpiceClipRects *data) } } -uint32_t generate_uid(DisplayChannel *display); void detach_streams_behind(DisplayChannel *display, QRegion *region, Drawable *drawable); void drawable_draw(DisplayChannel *display, Drawable *item); void drawables_init(DisplayChannel *display); |