diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2012-04-03 17:31:39 +0100 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2012-04-04 10:41:32 +0100 |
commit | 831ebf5dabd23d11186af9707631c29a1ecb3578 (patch) | |
tree | c15e211cfeb7d7088ad07fa5651d8e622ed68999 /src/virt-viewer-display.h | |
parent | e76beedf1f332ec7e5d3a6eb656a8dbe6be088fd (diff) | |
download | virt-viewer-831ebf5dabd23d11186af9707631c29a1ecb3578.tar.gz virt-viewer-831ebf5dabd23d11186af9707631c29a1ecb3578.tar.xz virt-viewer-831ebf5dabd23d11186af9707631c29a1ecb3578.zip |
Fix close of VNC displays
When clicking the close button on a virt-viewer window with
a VNC session open, while the VNC session terminates, the
window does not go away.
The problem is that the virt_viewer_session_vnc_disconnected
method never gets invoked. The close button triggers a call
to virt_viewer_session_clear_displays which unrefs the
VirtViewerDisplayVnc instance. This in turn triggers a call
to gtk_container_destroy, which destroys all widgets it
contains, ie the VncDisplay * object.
With the VncDisplay object in its dispose phase, no signals
will ever be emitted, thus the 'vnc-disconnected' signal
never gets seen.
The design issue is that VirtViewerDisplayVnc is assuming
it owns the VncDisplay, whereas in fact the real owner is
the VirtViewerSessionVnc object.
The solution is to introduce a new virt_viewer_display_close
method which can be used to de-parent the widget before
VirtViewerDisplay is unref'd.
The VirtViewerSessionVnc object also needs to hold a full ref
on the VncDisplay object, not merely a floating reference
* virt-viewer-display-spice.c, virt-viewer-display.c,
virt-viewer-display.h: Add virt_viewer_display_close
* virt-viewer-display-vnc.c: Deparent VNC widget in
virt_viewer_display_close impl
* virt-viewer-session-vnc.c: Improve logging
* virt-viewer-session.c: Call virt_viewer_display_close
before unrefing display
* virt-viewer-window.c: Improve logging
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'src/virt-viewer-display.h')
-rw-r--r-- | src/virt-viewer-display.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/virt-viewer-display.h b/src/virt-viewer-display.h index 07db5fd..ffbaf0e 100644 --- a/src/virt-viewer-display.h +++ b/src/virt-viewer-display.h @@ -75,6 +75,8 @@ struct _VirtViewerDisplayClass { GdkPixbuf *(*get_pixbuf)(VirtViewerDisplay *display); void (*release_cursor)(VirtViewerDisplay *display); + void (*close)(VirtViewerDisplay *display); + /* signals */ void (*display_pointer_grab)(VirtViewerDisplay *display); void (*display_pointer_ungrab)(VirtViewerDisplay *display); @@ -112,6 +114,8 @@ void virt_viewer_display_set_auto_resize(VirtViewerDisplay *display, gboolean au gboolean virt_viewer_display_get_auto_resize(VirtViewerDisplay *display); void virt_viewer_display_release_cursor(VirtViewerDisplay *display); +void virt_viewer_display_close(VirtViewerDisplay *display); + G_END_DECLS #endif /* _VIRT_VIEWER_DISPLAY_H */ |