diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-02-06 14:10:29 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:46 +0100 |
commit | c2556da161015a58cf82b17969e0beeaff287afe (patch) | |
tree | ba52a3dea45e1d6a9b5774bc6ad379ebae59d70c /server/display-channel.c | |
parent | 1c7cf80e55776fd1e4b60d972c309390660587dc (diff) | |
download | spice-c2556da161015a58cf82b17969e0beeaff287afe.tar.gz spice-c2556da161015a58cf82b17969e0beeaff287afe.tar.xz spice-c2556da161015a58cf82b17969e0beeaff287afe.zip |
CommonChannel -> CommonWorkerChannel
Rename this struct to make it clear that it's only the base class for
worker channels (e.g. display and cursor), not all channels.
Also renamed CommonChannelClient to CommonWorkerChannelClient.
Diffstat (limited to 'server/display-channel.c')
-rw-r--r-- | server/display-channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/display-channel.c b/server/display-channel.c index e76cac5c..d471997f 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -235,7 +235,7 @@ static void stop_streams(DisplayChannel *display) void display_channel_surface_unref(DisplayChannel *display, uint32_t surface_id) { RedSurface *surface = &display->surfaces[surface_id]; - RedWorker *worker = COMMON_CHANNEL(display)->worker; + RedWorker *worker = COMMON_WORKER_CHANNEL(display)->worker; QXLInstance *qxl = red_worker_get_qxl(worker); DisplayChannelClient *dcc; RingItem *link, *next; @@ -1364,7 +1364,7 @@ void display_channel_drawable_unref(DisplayChannel *display, Drawable *drawable) SPICE_CONTAINEROF(item, RedGlzDrawable, drawable_link)->drawable = NULL; ring_remove(item); } - red_drawable_unref(COMMON_CHANNEL(display)->worker, drawable->red_drawable, drawable->group_id); + red_drawable_unref(COMMON_WORKER_CHANNEL(display)->worker, drawable->red_drawable, drawable->group_id); drawable_free(display, drawable); display->drawable_count--; } @@ -1859,7 +1859,7 @@ static void on_disconnect(RedChannelClient *rcc) spice_return_if_fail(rcc != NULL); display = DCC_TO_DC(dcc); - worker = COMMON_CHANNEL(display)->worker; + worker = COMMON_WORKER_CHANNEL(display)->worker; spice_return_if_fail(rcc->channel == red_worker_get_display_channel(worker)); dcc_stop(dcc); // TODO: start/stop -> connect/disconnect? |