From f8201956ef422239fb9887806abe475da47a5dbe Mon Sep 17 00:00:00 2001
From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 18 Oct 2013 11:18:33 -0500
Subject: [PATCH] Don't disable fullscreen if kiosk mode is off

This conflicts with the --full-screen switch, because if kiosk mode is disabled,
it sets disables fullscreen mode, which overrides the earlier call to enable
fullscreen.

(cherry picked from commit 5fc5a2c8971a12b7aaf512265e3c2a75b961b043)
---
 src/virt-viewer-app.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 40c2633..dbd7101 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -1286,7 +1286,8 @@ virt_viewer_app_set_kiosk(VirtViewerApp *self, gboolean enabled)
     int i;
 
     self->priv->kiosk = enabled;
-    virt_viewer_app_set_fullscreen(self, enabled);
+    if (enabled)
+        virt_viewer_app_set_fullscreen(self, enabled);
 
     for (i = 0; i < gdk_screen_get_n_monitors(gdk_screen_get_default()); i++) {
         VirtViewerWindow *win = virt_viewer_app_get_nth_window(self, i);