summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2011-07-21 18:47:05 +0200
committerDaniel P. Berrange <berrange@redhat.com>2011-11-07 12:12:53 +0000
commit1175841df92a9e6488766941b96ed5194ee0ce33 (patch)
treec7ae79a7b719888b309ae4a38299f93e86e194ae
parentc8b3cd9dd9a2a0b75aafa29791936c35975c1a79 (diff)
downloadvirt-viewer-1175841df92a9e6488766941b96ed5194ee0ce33.tar.gz
virt-viewer-1175841df92a9e6488766941b96ed5194ee0ce33.tar.xz
virt-viewer-1175841df92a9e6488766941b96ed5194ee0ce33.zip
Emit display-desktop-resize from set_desktop_size()
-rw-r--r--src/virt-viewer-display-spice.c1
-rw-r--r--src/virt-viewer-display-vnc.c1
-rw-r--r--src/virt-viewer-display.c5
3 files changed, 5 insertions, 2 deletions
diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
index 39f77b9..c73692d 100644
--- a/src/virt-viewer-display-spice.c
+++ b/src/virt-viewer-display-spice.c
@@ -122,7 +122,6 @@ primary_create(SpiceChannel *channel G_GNUC_UNUSED,
DEBUG_LOG("spice desktop resize %dx%d", width, height);
virt_viewer_display_set_desktop_size(display, width, height);
- g_signal_emit_by_name(display, "display-desktop-resize");
}
diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
index 53d4728..5dd9744 100644
--- a/src/virt-viewer-display-vnc.c
+++ b/src/virt-viewer-display-vnc.c
@@ -140,7 +140,6 @@ virt_viewer_display_vnc_resize_desktop(VncDisplay *vnc G_GNUC_UNUSED,
DEBUG_LOG("desktop resize %dx%d", width, height);
virt_viewer_display_set_desktop_size(display, width, height);
- g_signal_emit_by_name(display, "display-desktop-resize");
}
diff --git a/src/virt-viewer-display.c b/src/virt-viewer-display.c
index 881a69e..fe25a8e 100644
--- a/src/virt-viewer-display.c
+++ b/src/virt-viewer-display.c
@@ -218,6 +218,7 @@ virt_viewer_display_init(VirtViewerDisplay *display)
display->priv->desktopHeight = 100;
display->priv->zoom_level = 100;
display->priv->zoom = TRUE;
+ display->priv->dirty = TRUE;
}
GtkWidget*
@@ -414,11 +415,15 @@ void virt_viewer_display_set_desktop_size(VirtViewerDisplay *display,
{
VirtViewerDisplayPrivate *priv = display->priv;
+ if (width == priv->desktopWidth && height == priv->desktopHeight)
+ return;
+
priv->desktopWidth = width;
priv->desktopHeight = height;
priv->dirty = TRUE;
gtk_widget_queue_resize(GTK_WIDGET(display));
+ g_signal_emit_by_name(display, "display-desktop-resize");
}