|
 |
4a6991 |
From 44ec55fb9997bdc312b21e707b0aff2ea5e159fa Mon Sep 17 00:00:00 2001
|
|
|
4a6991 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
|
4a6991 |
Date: Wed, 14 Aug 2013 22:30:12 +0200
|
|
|
4a6991 |
Subject: [PATCH] remote-viewer: remove -d direct option
|
|
|
4a6991 |
|
|
|
4a6991 |
remote-viewer currently doesn't provide automatic ssh tunnels, and even if
|
|
|
4a6991 |
it would, that would be explicit in the url given to remote-viewer (such
|
|
|
4a6991 |
as spice+ssh://...)
|
|
|
4a6991 |
|
|
|
4a6991 |
https://bugzilla.redhat.com/show_bug.cgi?id=991261
|
|
|
4a6991 |
(cherry picked from commit b8d114ef1dbf9b3c81ffd91d8497dd406ac61e26)
|
|
|
4a6991 |
---
|
|
|
4a6991 |
src/remote-viewer-main.c | 4 ----
|
|
|
4a6991 |
1 file changed, 4 deletions(-)
|
|
|
4a6991 |
|
|
|
4a6991 |
diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c
|
|
|
4a6991 |
index 820a676..19e5197 100644
|
|
|
4a6991 |
--- a/src/remote-viewer-main.c
|
|
|
4a6991 |
+++ b/src/remote-viewer-main.c
|
|
|
4a6991 |
@@ -112,7 +112,6 @@ main(int argc, char **argv)
|
|
|
4a6991 |
char *hotkeys = NULL;
|
|
|
4a6991 |
gboolean verbose = FALSE;
|
|
|
4a6991 |
gboolean debug = FALSE;
|
|
|
4a6991 |
- gboolean direct = FALSE;
|
|
|
4a6991 |
RemoteViewer *viewer = NULL;
|
|
|
4a6991 |
#ifdef HAVE_SPICE_GTK
|
|
|
4a6991 |
gboolean controller = FALSE;
|
|
|
4a6991 |
@@ -125,8 +124,6 @@ main(int argc, char **argv)
|
|
|
4a6991 |
N_("Display verbose information"), NULL },
|
|
|
4a6991 |
{ "title", 't', 0, G_OPTION_ARG_STRING, &title,
|
|
|
4a6991 |
N_("Set window title"), NULL },
|
|
|
4a6991 |
- { "direct", 'd', 0, G_OPTION_ARG_NONE, &direct,
|
|
|
4a6991 |
- N_("Direct connection with no automatic tunnels"), NULL },
|
|
|
4a6991 |
{ "zoom", 'z', 0, G_OPTION_ARG_INT, &zoom,
|
|
|
4a6991 |
N_("Zoom level of window, in percentage"), "ZOOM" },
|
|
|
4a6991 |
{ "debug", '\0', 0, G_OPTION_ARG_NONE, &debug,
|
|
|
4a6991 |
@@ -213,7 +210,6 @@ main(int argc, char **argv)
|
|
|
4a6991 |
g_object_set(app, "fullscreen-auto-conf", fullscreen_auto_conf, NULL);
|
|
|
4a6991 |
g_object_set(app, "fullscreen", fullscreen, NULL);
|
|
|
4a6991 |
virt_viewer_window_set_zoom_level(virt_viewer_app_get_main_window(app), zoom);
|
|
|
4a6991 |
- virt_viewer_app_set_direct(app, direct);
|
|
|
4a6991 |
virt_viewer_app_set_hotkeys(app, hotkeys);
|
|
|
4a6991 |
|
|
|
4a6991 |
if (!virt_viewer_app_start(app))
|