diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-01-27 14:51:28 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-01-31 12:36:14 +0000 |
| commit | 15b9f669a7df541908f03e5d8ac714a2a49749b3 (patch) | |
| tree | ed5163bbedbdc4c078addf96b0a2e32105c5e8cf /src | |
| parent | 392b69b6db8a65cbc4cc1809ce26adffe668d548 (diff) | |
Add spice_get_option_group()
Diffstat (limited to 'src')
| -rw-r--r-- | src/remote-viewer-main.c | 3 | ||||
| -rw-r--r-- | src/virt-viewer-main.c | 8 | ||||
| -rw-r--r-- | src/virt-viewer-session-spice.c | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c index 2256528..89ef25f 100644 --- a/src/remote-viewer-main.c +++ b/src/remote-viewer-main.c @@ -91,6 +91,9 @@ main(int argc, char **argv) #ifdef HAVE_GTK_VNC g_option_context_add_group (context, vnc_display_get_option_group ()); #endif +#ifdef HAVE_SPICE_GTK + g_option_context_add_group (context, spice_get_option_group ()); +#endif g_option_context_parse (context, &argc, &argv, &error); if (error) { g_printerr("%s\n%s\n", diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c index 7e2886b..07534b4 100644 --- a/src/virt-viewer-main.c +++ b/src/virt-viewer-main.c @@ -25,11 +25,12 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <stdlib.h> - #ifdef HAVE_GTK_VNC #include <vncdisplay.h> #endif - +#ifdef HAVE_SPICE_GTK +#include <spice-option.h> +#endif #include "virt-viewer.h" static void virt_viewer_version(void) @@ -94,6 +95,9 @@ int main(int argc, char **argv) #ifdef HAVE_GTK_VNC g_option_context_add_group (context, vnc_display_get_option_group ()); #endif +#ifdef HAVE_SPICE_GTK + g_option_context_add_group (context, spice_get_option_group ()); +#endif g_option_context_parse (context, &argc, &argv, &error); if (error) { g_printerr("%s\n%s\n", diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c index f89d042..de2da3d 100644 --- a/src/virt-viewer-session-spice.c +++ b/src/virt-viewer-session-spice.c @@ -23,9 +23,9 @@ */ #include <spice-audio.h> - #include <glib/gi18n.h> +#include <spice-option.h> #include "virt-viewer-util.h" #include "virt-viewer-session-spice.h" #include "virt-viewer-display-spice.h" @@ -154,7 +154,9 @@ virt_viewer_session_spice_close(VirtViewerSession *session) self->priv->audio = NULL; } + /* FIXME: version 0.7 of spice-gtk allows reuse of session */ self->priv->session = spice_session_new(); + spice_set_session_option(self->priv->session); g_signal_connect(self->priv->session, "channel-new", G_CALLBACK(virt_viewer_session_spice_channel_new), self); g_signal_connect(self->priv->session, "channel-destroy", @@ -351,6 +353,8 @@ virt_viewer_session_spice_new(void) self = g_object_new(VIRT_VIEWER_TYPE_SESSION_SPICE, NULL); self->priv->session = spice_session_new(); + spice_set_session_option(self->priv->session); + g_signal_connect(self->priv->session, "channel-new", G_CALLBACK(virt_viewer_session_spice_channel_new), self); g_signal_connect(self->priv->session, "channel-destroy", |