diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-01-31 14:06:00 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-01-31 14:06:00 +0000 |
| commit | 6c6ec5f9ea7771c0588645fd24a3517c419cc59f (patch) | |
| tree | 3dcdbf2b3d5e88a99c7c19c4f5cb7a4eee11bdc7 /src/remote-viewer-main.c | |
| parent | e2799ecfa6fe6b0d75b0759d18efd44fd1531853 (diff) | |
| download | virt-viewer-6c6ec5f9ea7771c0588645fd24a3517c419cc59f.tar.gz virt-viewer-6c6ec5f9ea7771c0588645fd24a3517c419cc59f.tar.xz virt-viewer-6c6ec5f9ea7771c0588645fd24a3517c419cc59f.zip | |
Adapt remote-viewer so that it builds without SPICE
Diffstat (limited to 'src/remote-viewer-main.c')
| -rw-r--r-- | src/remote-viewer-main.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c index 89ef25f..fc491e9 100644 --- a/src/remote-viewer-main.c +++ b/src/remote-viewer-main.c @@ -56,7 +56,9 @@ main(int argc, char **argv) gboolean direct = FALSE; gboolean fullscreen = FALSE; RemoteViewer *viewer = NULL; +#if HAVE_SPICE_GTK gboolean controller = FALSE; +#endif VirtViewerApp *app; const char *help_msg = N_("Run '" PACKAGE " --help' to see a full list of available command line options"); const GOptionEntry options [] = { @@ -72,8 +74,10 @@ main(int argc, char **argv) N_("Display debugging information"), NULL }, { "full-screen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen, N_("Open in full screen mode"), NULL }, +#if HAVE_SPICE_GTK { "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &controller, N_("Open connection using Spice controller communication"), NULL }, +#endif { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &args, NULL, "URI" }, { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } @@ -105,8 +109,11 @@ main(int argc, char **argv) g_option_context_free(context); - if ((!args || (g_strv_length(args) != 1)) && - !controller) { + if ((!args || (g_strv_length(args) != 1)) +#if HAVE_SPICE_GTK + && !controller +#endif + ) { g_printerr(_("\nUsage: %s [OPTIONS] URI\n\n%s\n\n"), argv[0], help_msg); goto cleanup; } @@ -118,14 +125,17 @@ main(int argc, char **argv) virt_viewer_app_set_debug(debug); +#if HAVE_SPICE_GTK if (controller) { viewer = remote_viewer_new_with_controller(verbose); g_object_set(viewer, "guest-name", "defined by Spice controller", NULL); } else { +#endif viewer = remote_viewer_new(args[0], verbose); g_object_set(viewer, "guest-name", args[0], NULL); - +#if HAVE_SPICE_GTK } +#endif if (viewer == NULL) goto cleanup; |