shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-02-01 05:47:06 +03:00
Code Issues Projects Releases Wiki Activity

display: make klass->close() optional

Browse Source 
Spice and VTE display do not need to implement it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-07-26 18:57:10 +02:00
parent 029cd8a031
commit 45eeda66a2
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virt-viewer-display-spice.c
View File

@ -56,7 +56,6 @@ static void virt_viewer_display_spice_send_keys(VirtViewerDisplay *display,
int nkeyvals);
static GdkPixbuf *virt_viewer_display_spice_get_pixbuf(VirtViewerDisplay *display);
static void virt_viewer_display_spice_release_cursor(VirtViewerDisplay *display);
static void virt_viewer_display_spice_close(VirtViewerDisplay *display G_GNUC_UNUSED);
static gboolean virt_viewer_display_spice_selectable(VirtViewerDisplay *display);
static void virt_viewer_display_spice_enable(VirtViewerDisplay *display);
static void virt_viewer_display_spice_disable(VirtViewerDisplay *display);
@ -69,7 +68,6 @@ virt_viewer_display_spice_class_init(VirtViewerDisplaySpiceClass *klass)
dclass->send_keys = virt_viewer_display_spice_send_keys;
dclass->get_pixbuf = virt_viewer_display_spice_get_pixbuf;
dclass->release_cursor = virt_viewer_display_spice_release_cursor;
dclass->close = virt_viewer_display_spice_close;
dclass->selectable = virt_viewer_display_spice_selectable;
dclass->enable = virt_viewer_display_spice_enable;
dclass->disable = virt_viewer_display_spice_disable;
@ -348,12 +346,6 @@ virt_viewer_display_spice_release_cursor(VirtViewerDisplay *display)
spice_display_mouse_ungrab(self->priv->display);
}
static void
virt_viewer_display_spice_close(VirtViewerDisplay *display G_GNUC_UNUSED)
{
}
static gboolean
virt_viewer_display_spice_selectable(VirtViewerDisplay *self)
{

5
src/virt-viewer-display.c
View File

@ -657,9 +657,8 @@ void virt_viewer_display_close(VirtViewerDisplay *self)
g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self));
klass = VIRT_VIEWER_DISPLAY_GET_CLASS(self);
g_return_if_fail(klass->close != NULL);
klass->close(self);
if (klass->close)
klass->close(self);
}
void virt_viewer_display_set_fullscreen(VirtViewerDisplay *self, gboolean fullscreen)