summaryrefslogtreecommitdiffstats
path: root/src/viewer.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2010-11-30 15:57:23 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2010-11-30 15:57:23 +0100
commitbe22c7dcf0f2fc0f9d384e3c7faa4897477a8f9a (patch)
tree356d10738bdeb4b1a24351d11fecb53f28c1c0ae /src/viewer.c
parent155a03f9c83ade6b849dca401f5c176bccf4123a (diff)
downloadvirt-viewer-be22c7dcf0f2fc0f9d384e3c7faa4897477a8f9a.tar.gz
virt-viewer-be22c7dcf0f2fc0f9d384e3c7faa4897477a8f9a.tar.xz
virt-viewer-be22c7dcf0f2fc0f9d384e3c7faa4897477a8f9a.zip
viewer: add support for spice resize-guest
And also turn on clipboard sharing.
Diffstat (limited to 'src/viewer.c')
-rw-r--r--src/viewer.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/viewer.c b/src/viewer.c
index 6ec021a..5d63343 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -130,8 +130,15 @@ void viewer_add_display_and_realize(VirtViewer *viewer)
g_return_if_fail(viewer->display->widget != NULL);
notebook = glade_xml_get_widget(viewer->glade, "notebook");
- align = glade_xml_get_widget(viewer->glade, "display-align");
- gtk_container_add(GTK_CONTAINER(align), viewer->display->widget);
+ if (viewer->display->need_align) {
+ align = glade_xml_get_widget(viewer->glade, "display-align");
+ gtk_container_add(GTK_CONTAINER(align), viewer->display->widget);
+ } else {
+ gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), 2);
+ if (gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), viewer->display->widget,
+ NULL, 2) == -1)
+ g_warning("failed to insert a notebook page");
+ }
if (!viewer->window) {
gtk_container_add(GTK_CONTAINER(viewer->container), GTK_WIDGET(notebook));
@@ -763,9 +770,9 @@ static void viewer_show_display(VirtViewer *viewer)
g_return_if_fail(viewer->display->widget != NULL);
notebook = glade_xml_get_widget(viewer->glade, "notebook");
- gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 1);
-
gtk_widget_show(viewer->display->widget);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
+ viewer->display->need_align ? 1 : 2);
}
static void viewer_connect_info_free(VirtViewer *viewer)