[virt-tools-list] [PATCH virt-viewer 10/12] kiosk: don't open extra monitors
Marc-André Lureau
marcandre.lureau at gmail.com
Mon Jul 15 19:36:17 UTC 2013
In kiosk mode, we don't want new monitors windows that wouldn't fit on
the client monitors to come up. # Please enter the commit message for
your changes. Lines starting # with '#' will be ignored, and an empty
message aborts the commit. # On branch kiosk # Changes to be committed:
src/virt-viewer-app.c # # Changes not staged for commit: # (use "git add
<file>..." to update what will be committed) # (use "git checkout --
<file>..." to discard changes in working directory) # # modified:
src/virt-viewer-app.c # modified: src/virt-viewer-display-spice.c #
modified: src/virt-viewer-window.c # # Untracked files: # (use "git add
<file>..." to include in what will be committed) # # AUTHORS
---
src/virt-viewer-app.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 86ebdad..9692f2c 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -721,8 +721,15 @@ virt_viewer_app_display_added(VirtViewerSession *session G_GNUC_UNUSED,
if (nth == 0) {
window = priv->main_window;
} else {
- g_return_if_fail(virt_viewer_app_get_nth_window(self, nth) == NULL);
- window = virt_viewer_app_window_new(self, nth);
+ window = virt_viewer_app_get_nth_window(self, nth);
+ if (window == NULL) {
+ if (priv->kiosk) {
+ /* don't show extra monitors that don't fit on client */
+ g_object_unref(display);
+ return;
+ } else
+ window = virt_viewer_app_window_new(self, nth);
+ }
}
virt_viewer_window_set_display(window, display);
--
1.8.3.rc1.49.g8d97506
More information about the virt-tools-list
mailing list