remove-spice-controller.patch

   1 From 140cb84c2538bf0eab7dea2035dfecc4db74c784 Mon Sep 17 00:00:00 2001
   2 From: Marc-André Lureau <marcandre.lureau@redhat.com>
   3 Date: Nov 16 2017 16:04:05 +0000
   4 Subject: remote-viewer: remove --spice-controller
   5
   6
   7 spice controller interface is being removed from spice-gtk.
   8
   9 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
  10 Reviewed-by: Victor Toso <victortoso@redhat.com>
  11
  12 ---
  13
  14 diff --git a/configure.ac b/configure.ac
  15 index 61374fa..e262e31 100644
  16 --- a/configure.ac
  17 +++ b/configure.ac
  18 @@ -159,13 +159,12 @@ AC_ARG_WITH([spice-gtk],
  19  AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"],
  20        [PKG_CHECK_EXISTS([spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
  21                           spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED
  22 -                         spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED],
  23 +                         spice-protocol >= $SPICE_PROTOCOL_REQUIRED],
  24                          [with_spice_gtk=yes], [with_spice_gtk=no])])
  25
  26  AS_IF([test "x$with_spice_gtk" = "xyes"],
  27        [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
  28                                       spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED])]
  29 -      [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])]
  30        [PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])]
  31        [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])]
  32  )
  33 diff --git a/data/Makefile.am b/data/Makefile.am
  34 index 55718d9..54be2b1 100644
  35 --- a/data/Makefile.am
  36 +++ b/data/Makefile.am
  37 @@ -3,7 +3,6 @@ CLEANFILES =
  38  MANUFACTURER = Virt Manager Project
  39
  40  EXTRA_DIST =                                   \
  41 -       spice-xpi-client-remote-viewer          \
  42         virt-viewer.wxs.in                      \
  43         $(NULL)
  44
  45 diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer
  46 deleted file mode 100644
  47 index 3109c66..0000000
  48 --- a/data/spice-xpi-client-remote-viewer
  49 +++ /dev/null
  50 @@ -1,6 +0,0 @@
  51 -#!/bin/sh
  52 -
  53 -logger -t spice "starting remote-viewer --spice-controller $@..."
  54 -env | logger -t spice
  55 -exec remote-viewer --spice-controller "$@" 2>&1 | logger -t spice
  56 -logger -t spice "remote-viewer execution failed"
  57 diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in
  58 index 9838265..2047720 100644
  59 --- a/data/virt-viewer.wxs.in
  60 +++ b/data/virt-viewer.wxs.in
  61 @@ -55,16 +55,6 @@
  62      <Condition Message="VirtViewer is already installed.">NOT NEWERVERSIONDETECTED</Condition>
  63
  64      <DirectoryRef Id="TARGETDIR">
  65 -      <Component Id="CRegistryEntries" Guid="*">
  66 -        <RegistryKey Root='HKLM' Key='Software\Microsoft\Internet Explorer\Low Rights\ElevationPolicy\{96190E9D-6FBB-64DB-9095-29F6FDE0B897}'>
  67 -          <RegistryValue Type='string' Name='AppPath' Value='[INSTALLDIR]\bin'/>
  68 -          <RegistryValue Type='string' Name='AppName' Value='remote-viewer.exe'/>
  69 -          <RegistryValue Type='integer' Name='Policy' Value='3'/>
  70 -        </RegistryKey>
  71 -        <RegistryKey Root='HKLM' Key='Software\spice-space.org\spicex'>
  72 -          <RegistryValue Type='string' Name='client' Value='[INSTALLDIR]\bin\remote-viewer.exe --spice-controller'/>
  73 -        </RegistryKey>
  74 -      </Component>
  75        <Component Id="CProgIds" Guid="89D6F46D-9C5E-4D65-8456-58FC361E553E">
  76          <ProgId Id='VirtViewer.vvfile' Description='VirtViewer connection file'>
  77            <Extension Id='vv' ContentType='application/x-virt-viewer'>
  78 @@ -129,7 +119,6 @@
  79        <ComponentGroupRef Id="CG.virt-viewer"/>
  80        <ComponentRef Id="CDepsFile"/>
  81        <ComponentRef Id="CShortcut"/>
  82 -      <ComponentRef Id="CRegistryEntries"/>
  83        <ComponentRef Id="CProgIds"/>
  84        <ComponentRef Id="CHwdataUSB"/>
  85      </Feature>
  86 diff --git a/man/remote-viewer.pod b/man/remote-viewer.pod
  87 index 8428c80..968ea70 100644
  88 --- a/man/remote-viewer.pod
  89 +++ b/man/remote-viewer.pod
  90 @@ -58,12 +58,6 @@ CONFIGURATION section below.
  91
  92  Set the window title to B<TITLE>
  93
  94 -=item --spice-controller
  95 -
  96 -Use the SPICE controller to initialize the connection with the SPICE
  97 -server. This option is used by the SPICE browser addons to allow web
  98 -page to start a client.
  99 -
 100  =item --debug
 101
 102  Print debugging information
 103 diff --git a/src/Makefile.am b/src/Makefile.am
 104 index b9e3421..a6807b6 100644
 105 --- a/src/Makefile.am
 106 +++ b/src/Makefile.am
 107 @@ -180,11 +180,9 @@ remote_viewer_SOURCES =                            \
 108         $(NULL)
 109  remote_viewer_LDFLAGS =                                \
 110         $(COMMON_LIBS)                          \
 111 -       $(SPICE_CONTROLLER_LIBS)                \
 112         $(NULL)
 113  remote_viewer_CFLAGS =                         \
 114         $(COMMON_CFLAGS)                        \
 115 -       $(SPICE_CONTROLLER_CFLAGS)              \
 116         $(NULL)
 117  remote_viewer_LDADD = \
 118         libvirt-viewer-util.la \
 119 diff --git a/src/remote-viewer.c b/src/remote-viewer.c
 120 index 98f13ac..c52d20f 100644
 121 --- a/src/remote-viewer.c
 122 +++ b/src/remote-viewer.c
 123 @@ -36,7 +36,6 @@
 124  #endif
 125
 126  #ifdef HAVE_SPICE_GTK
 127 -#include <spice-controller.h>
 128  #include "virt-viewer-session-spice.h"
 129  #endif
 130
 131 @@ -49,10 +48,6 @@
 132  #include "remote-viewer-connect.h"
 133
 134  struct _RemoteViewerPrivate {
 135 -#ifdef HAVE_SPICE_GTK
 136 -    SpiceCtrlController *controller;
 137 -    SpiceCtrlForeignMenu *ctrl_foreign_menu;
 138 -#endif
 139  #ifdef HAVE_OVIRT
 140      OvirtForeignMenu *ovirt_foreign_menu;
 141  #endif
 142 @@ -78,33 +73,15 @@ static OvirtVm * choose_vm(GtkWindow *main_window,
 143  #endif
 144
 145  static gboolean remote_viewer_start(VirtViewerApp *self, GError **error);
 146 -#ifdef HAVE_SPICE_GTK
 147 -static gboolean remote_viewer_activate(VirtViewerApp *self, GError **error);
 148 -static void remote_viewer_window_added(GtkApplication *app, GtkWindow *w);
 149 -static void spice_foreign_menu_updated(RemoteViewer *self);
 150 -static void foreign_menu_title_changed(SpiceCtrlForeignMenu *menu, GParamSpec *pspec, RemoteViewer *self);
 151 -#endif
 152
 153  static void
 154  remote_viewer_dispose (GObject *object)
 155  {
 156 -#if defined(HAVE_SPICE_GTK) || defined(HAVE_OVIRT)
 157 +#if defined(HAVE_OVIRT)
 158      RemoteViewer *self = REMOTE_VIEWER(object);
 159      RemoteViewerPrivate *priv = self->priv;
 160  #endif
 161
 162 -#ifdef HAVE_SPICE_GTK
 163 -    if (priv->controller) {
 164 -        g_object_unref(priv->controller);
 165 -        priv->controller = NULL;
 166 -    }
 167 -
 168 -    if (priv->ctrl_foreign_menu) {
 169 -        g_object_unref(priv->ctrl_foreign_menu);
 170 -        priv->ctrl_foreign_menu = NULL;
 171 -    }
 172 -#endif
 173 -
 174  #ifdef HAVE_OVIRT
 175      if (priv->ovirt_foreign_menu) {
 176          g_object_unref(priv->ovirt_foreign_menu);
 177 @@ -132,7 +109,6 @@ remote_viewer_deactivated(VirtViewerApp *app, gboolean connect_error)
 178
 179  static gchar **opt_args = NULL;
 180  static char *opt_title = NULL;
 181 -static gboolean opt_controller = FALSE;
 182
 183  static void
 184  remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOptionGroup *group)
 185 @@ -140,10 +116,6 @@ remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, G
 186      static const GOptionEntry options[] = {
 187          { "title", 't', 0, G_OPTION_ARG_STRING, &opt_title,
 188            N_("Set window title"), NULL },
 189 -#ifdef HAVE_SPICE_GTK
 190 -        { "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &opt_controller,
 191 -          N_("Open connection using Spice controller communication"), NULL },
 192 -#endif
 193          { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args,
 194            NULL, "URI|VV-FILE" },
 195          { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 196 @@ -184,27 +156,7 @@ remote_viewer_local_command_line (GApplication   *gapp,
 197          g_object_set(app, "guri", opt_args[0], NULL);
 198      }
 199
 200 -#ifdef HAVE_SPICE_GTK
 201 -    if (opt_controller) {
 202 -        if (opt_args) {
 203 -            g_printerr(_("\nError: extra arguments given while using Spice controller\n\n"));
 204 -            ret = TRUE;
 205 -            *status = 1;
 206 -            goto end;
 207 -        }
 208 -
 209 -        self->priv->controller = spice_ctrl_controller_new();
 210 -        self->priv->ctrl_foreign_menu = spice_ctrl_foreign_menu_new();
 211 -
 212 -        g_object_set(self, "guest-name", "defined by Spice controller", NULL);
 213 -
 214 -        g_signal_connect(self->priv->ctrl_foreign_menu, "notify::title",
 215 -                         G_CALLBACK(foreign_menu_title_changed),
 216 -                         self);
 217 -    }
 218 -#endif
 219 -
 220 -    if (opt_title && !opt_controller)
 221 +    if (opt_title)
 222          g_object_set(app, "title", opt_title, NULL);
 223
 224  end:
 225 @@ -241,7 +193,6 @@ static void
 226  remote_viewer_class_init (RemoteViewerClass *klass)
 227  {
 228      GObjectClass *object_class = G_OBJECT_CLASS (klass);
 229 -    GtkApplicationClass *gtk_app_class = GTK_APPLICATION_CLASS(klass);
 230      VirtViewerAppClass *app_class = VIRT_VIEWER_APP_CLASS (klass);
 231      GApplicationClass *g_app_class = G_APPLICATION_CLASS(klass);
 232
 233 @@ -255,12 +206,6 @@ remote_viewer_class_init (RemoteViewerClass *klass)
 234      app_class->start = remote_viewer_start;
 235      app_class->deactivated = remote_viewer_deactivated;
 236      app_class->add_option_entries = remote_viewer_add_option_entries;
 237 -#ifdef HAVE_SPICE_GTK
 238 -    app_class->activate = remote_viewer_activate;
 239 -    gtk_app_class->window_added = remote_viewer_window_added;
 240 -#else
 241 -    (void) gtk_app_class;
 242 -#endif
 243
 244  #ifdef HAVE_OVIRT
 245      g_object_class_install_property(object_class,
 246 @@ -288,217 +233,7 @@ remote_viewer_new(void)
 247                          NULL);
 248  }
 249
 250 -#ifdef HAVE_SPICE_GTK
 251 -static void
 252 -foreign_menu_title_changed(SpiceCtrlForeignMenu *menu G_GNUC_UNUSED,
 253 -                           GParamSpec *pspec G_GNUC_UNUSED,
 254 -                           RemoteViewer *self)
 255 -{
 256 -    gboolean has_focus;
 257 -
 258 -    g_object_get(G_OBJECT(self), "has-focus", &has_focus, NULL);
 259 -    /* FIXME: use a proper "new client connected" event
 260 -    ** a foreign menu client set the title when connecting,
 261 -    ** inform of focus state at that time.
 262 -    */
 263 -    spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, has_focus);
 264 -
 265 -    /* update menu title */
 266 -    spice_foreign_menu_updated(self);
 267 -}
 268 -
 269 -static void
 270 -spice_ctrl_do_connect(SpiceCtrlController *ctrl G_GNUC_UNUSED,
 271 -                      VirtViewerApp *self)
 272 -{
 273 -    GError *error = NULL;
 274 -
 275 -    if (!virt_viewer_app_initial_connect(self, &error)) {
 276 -        const gchar *msg = error ? error->message :
 277 -            _("Failed to initiate connection");
 278 -        virt_viewer_app_simple_message_dialog(self, msg);
 279 -        g_clear_error(&error);
 280 -    }
 281 -}
 282 -
 283 -static void
 284 -spice_ctrl_show(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self)
 285 -{
 286 -    virt_viewer_app_show_display(VIRT_VIEWER_APP(self));
 287 -}
 288 -
 289 -static void
 290 -spice_ctrl_hide(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self)
 291 -{
 292 -    virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Display disabled by controller"));
 293 -}
 294 -
 295 -static void
 296 -spice_menuitem_activate_cb(GtkMenuItem *mi, GObject *ctrl)
 297 -{
 298 -    SpiceCtrlMenuItem *menuitem = g_object_get_data(G_OBJECT(mi), "spice-menuitem");
 299 -
 300 -    g_return_if_fail(menuitem != NULL);
 301 -    if (gtk_menu_item_get_submenu(mi))
 302 -        return;
 303 -
 304 -    if (SPICE_CTRL_IS_CONTROLLER(ctrl))
 305 -        spice_ctrl_controller_menu_item_click_msg(SPICE_CTRL_CONTROLLER(ctrl), menuitem->id);
 306 -    else if (SPICE_CTRL_IS_FOREIGN_MENU(ctrl))
 307 -        spice_ctrl_foreign_menu_menu_item_click_msg(SPICE_CTRL_FOREIGN_MENU(ctrl), menuitem->id);
 308 -}
 309 -
 310 -static GtkWidget *
 311 -ctrlmenu_to_gtkmenu (RemoteViewer *self, SpiceCtrlMenu *ctrlmenu, GObject *ctrl)
 312 -{
 313 -    GList *l;
 314 -    GtkWidget *menu = gtk_menu_new();
 315 -    guint n = 0;
 316 -
 317 -    for (l = ctrlmenu->items; l != NULL; l = l->next) {
 318 -        SpiceCtrlMenuItem *menuitem = l->data;
 319 -        GtkWidget *item;
 320 -        char *s;
 321 -        if (menuitem->text == NULL) {
 322 -            g_warn_if_reached();
 323 -            continue;
 324 -        }
 325 -
 326 -        for (s = menuitem->text; *s; s++)
 327 -            if (*s == '&')
 328 -                *s = '_';
 329 -
 330 -        if (g_str_equal(menuitem->text, "-")) {
 331 -            item = gtk_separator_menu_item_new();
 332 -        } else if (menuitem->flags & CONTROLLER_MENU_FLAGS_CHECKED) {
 333 -            item = gtk_check_menu_item_new_with_mnemonic(menuitem->text);
 334 -            g_object_set(item, "active", TRUE, NULL);
 335 -        } else {
 336 -            item = gtk_menu_item_new_with_mnemonic(menuitem->text);
 337 -        }
 338 -
 339 -        if (menuitem->flags & (CONTROLLER_MENU_FLAGS_GRAYED | CONTROLLER_MENU_FLAGS_DISABLED))
 340 -            gtk_widget_set_sensitive(item, FALSE);
 341 -
 342 -        g_object_set_data_full(G_OBJECT(item), "spice-menuitem",
 343 -                               g_object_ref(menuitem), g_object_unref);
 344 -        g_signal_connect(item, "activate", G_CALLBACK(spice_menuitem_activate_cb), ctrl);
 345 -        gtk_menu_attach(GTK_MENU (menu), item, 0, 1, n, n + 1);
 346 -        n += 1;
 347 -
 348 -        if (menuitem->submenu) {
 349 -            gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),
 350 -                                      ctrlmenu_to_gtkmenu(self, menuitem->submenu, ctrl));
 351 -        }
 352 -    }
 353 -
 354 -    if (n == 0) {
 355 -        g_object_ref_sink(menu);
 356 -        g_object_unref(menu);
 357 -        menu = NULL;
 358 -    }
 359 -
 360 -    gtk_widget_show_all(menu);
 361 -    return menu;
 362 -}
 363 -
 364 -static void
 365 -spice_menu_update(RemoteViewer *self, VirtViewerWindow *win)
 366 -{
 367 -    GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "spice-menu");
 368 -    SpiceCtrlMenu *menu;
 369 -
 370 -    if (self->priv->controller == NULL)
 371 -        return;
 372 -
 373 -    if (menuitem != NULL)
 374 -        gtk_widget_destroy(menuitem);
 375 -
 376 -    {
 377 -        GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu"));
 378 -        menuitem = gtk_menu_item_new_with_label("Spice");
 379 -        gtk_menu_shell_append(shell, menuitem);
 380 -        g_object_set_data(G_OBJECT(win), "spice-menu", menuitem);
 381 -    }
 382 -
 383 -    g_object_get(self->priv->controller, "menu", &menu, NULL);
 384 -    if (menu == NULL || g_list_length(menu->items) == 0) {
 385 -        gtk_widget_set_visible(menuitem, FALSE);
 386 -    } else {
 387 -        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
 388 -            ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->controller)));
 389 -        gtk_widget_set_visible(menuitem, TRUE);
 390 -    }
 391 -
 392 -    if (menu != NULL)
 393 -        g_object_unref(menu);
 394 -}
 395 -
 396 -static void
 397 -spice_menu_update_each(gpointer value,
 398 -                       gpointer user_data)
 399 -{
 400 -    spice_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value));
 401 -}
 402 -
 403 -static void
 404 -spice_ctrl_menu_updated(RemoteViewer *self)
 405 -{
 406 -    GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self));
 407 -
 408 -    g_debug("Spice controller menu updated");
 409 -
 410 -    g_list_foreach(windows, spice_menu_update_each, self);
 411 -}
 412 -
 413 -static void
 414 -spice_foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win)
 415 -{
 416 -    GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "foreign-menu");
 417 -    SpiceCtrlMenu *menu;
 418 -
 419 -    if (self->priv->ctrl_foreign_menu == NULL)
 420 -        return;
 421 -
 422 -    if (menuitem != NULL)
 423 -        gtk_widget_destroy(menuitem);
 424 -
 425 -    {
 426 -        GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu"));
 427 -        const gchar *title = spice_ctrl_foreign_menu_get_title(self->priv->ctrl_foreign_menu);
 428 -        menuitem = gtk_menu_item_new_with_label(title);
 429 -        gtk_menu_shell_append(shell, menuitem);
 430 -        g_object_set_data(G_OBJECT(win), "foreign-menu", menuitem);
 431 -    }
 432 -
 433 -    g_object_get(self->priv->ctrl_foreign_menu, "menu", &menu, NULL);
 434 -    if (menu == NULL || g_list_length(menu->items) == 0) {
 435 -        gtk_widget_set_visible(menuitem, FALSE);
 436 -    } else {
 437 -        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
 438 -            ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->ctrl_foreign_menu)));
 439 -        gtk_widget_set_visible(menuitem, TRUE);
 440 -    }
 441 -    g_object_unref(menu);
 442 -}
 443 -
 444 -static void
 445 -spice_foreign_menu_update_each(gpointer value,
 446 -                               gpointer user_data)
 447 -{
 448 -    spice_foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value));
 449 -}
 450 -
 451 -static void
 452 -spice_foreign_menu_updated(RemoteViewer *self)
 453 -{
 454 -    GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self));
 455 -
 456 -    g_debug("Spice foreign menu updated");
 457 -
 458 -    g_list_foreach(windows, spice_foreign_menu_update_each, self);
 459 -}
 460 -
 461 +#if defined(HAVE_SPICE_GTK) && defined(HAVE_OVIRT)
 462  static SpiceSession *
 463  remote_viewer_get_spice_session(RemoteViewer *self)
 464  {
 465 @@ -514,158 +249,6 @@ remote_viewer_get_spice_session(RemoteViewer *self)
 466
 467      return session;
 468  }
 469 -
 470 -static void
 471 -app_notified(VirtViewerApp *app,
 472 -             GParamSpec *pspec,
 473 -             RemoteViewer *self)
 474 -{
 475 -    GValue value = G_VALUE_INIT;
 476 -
 477 -    g_value_init(&value, pspec->value_type);
 478 -    g_object_get_property(G_OBJECT(app), pspec->name, &value);
 479 -
 480 -    if (g_str_equal(pspec->name, "has-focus")) {
 481 -        if (self->priv->ctrl_foreign_menu)
 482 -            spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, g_value_get_boolean(&value));
 483 -    }
 484 -
 485 -    g_value_unset(&value);
 486 -}
 487 -
 488 -static void
 489 -spice_ctrl_notified(SpiceCtrlController *ctrl,
 490 -                    GParamSpec *pspec,
 491 -                    RemoteViewer *self)
 492 -{
 493 -    SpiceSession *session = remote_viewer_get_spice_session(self);
 494 -    GValue value = G_VALUE_INIT;
 495 -    VirtViewerApp *app = VIRT_VIEWER_APP(self);
 496 -
 497 -    g_return_if_fail(session != NULL);
 498 -
 499 -    g_value_init(&value, pspec->value_type);
 500 -    g_object_get_property(G_OBJECT(ctrl), pspec->name, &value);
 501 -
 502 -    if (g_str_equal(pspec->name, "host") ||
 503 -        g_str_equal(pspec->name, "port") ||
 504 -        g_str_equal(pspec->name, "password") ||
 505 -        g_str_equal(pspec->name, "ca-file") ||
 506 -        g_str_equal(pspec->name, "enable-smartcard") ||
 507 -        g_str_equal(pspec->name, "color-depth") ||
 508 -        g_str_equal(pspec->name, "disable-effects") ||
 509 -        g_str_equal(pspec->name, "enable-usbredir") ||
 510 -        g_str_equal(pspec->name, "secure-channels") ||
 511 -        g_str_equal(pspec->name, "proxy")) {
 512 -        g_object_set_property(G_OBJECT(session), pspec->name, &value);
 513 -    } else if (g_str_equal(pspec->name, "sport")) {
 514 -        g_object_set_property(G_OBJECT(session), "tls-port", &value);
 515 -    } else if (g_str_equal(pspec->name, "tls-ciphers")) {
 516 -        g_object_set_property(G_OBJECT(session), "ciphers", &value);
 517 -    } else if (g_str_equal(pspec->name, "host-subject")) {
 518 -        g_object_set_property(G_OBJECT(session), "cert-subject", &value);
 519 -    } else if (g_str_equal(pspec->name, "enable-usb-autoshare")) {
 520 -        VirtViewerSession *vsession = NULL;
 521 -
 522 -        g_object_get(self, "session", &vsession, NULL);
 523 -        g_object_set_property(G_OBJECT(vsession), "auto-usbredir", &value);
 524 -        g_object_unref(G_OBJECT(vsession));
 525 -    } else if (g_str_equal(pspec->name, "usb-filter")) {
 526 -        SpiceUsbDeviceManager *manager;
 527 -        manager = spice_usb_device_manager_get(session, NULL);
 528 -        if (manager != NULL) {
 529 -            g_object_set_property(G_OBJECT(manager),
 530 -                                  "auto-connect-filter",
 531 -                                  &value);
 532 -        }
 533 -    } else if (g_str_equal(pspec->name, "title")) {
 534 -        g_object_set(app, "title", g_value_get_string(&value), NULL);
 535 -    } else if (g_str_equal(pspec->name, "display-flags")) {
 536 -        guint flags = g_value_get_uint(&value);
 537 -        gboolean fullscreen = !!(flags & CONTROLLER_SET_FULL_SCREEN);
 538 -        g_object_set(G_OBJECT(self), "fullscreen", fullscreen, NULL);
 539 -    } else if (g_str_equal(pspec->name, "menu")) {
 540 -        spice_ctrl_menu_updated(self);
 541 -    } else if (g_str_equal(pspec->name, "hotkeys")) {
 542 -        virt_viewer_app_set_hotkeys(app, g_value_get_string(&value));
 543 -    } else {
 544 -        gchar *content = g_strdup_value_contents(&value);
 545 -
 546 -        g_debug("unimplemented property: %s=%s", pspec->name, content);
 547 -        g_free(content);
 548 -    }
 549 -
 550 -    g_object_unref(session);
 551 -    g_value_unset(&value);
 552 -}
 553 -
 554 -static void
 555 -spice_ctrl_foreign_menu_notified(SpiceCtrlForeignMenu *ctrl_foreign_menu G_GNUC_UNUSED,
 556 -                                 GParamSpec *pspec,
 557 -                                 RemoteViewer *self)
 558 -{
 559 -    if (g_str_equal(pspec->name, "menu")) {
 560 -        spice_foreign_menu_updated(self);
 561 -    }
 562 -}
 563 -
 564 -static void
 565 -spice_ctrl_listen_async_cb(GObject *object,
 566 -                           GAsyncResult *res,
 567 -                           gpointer user_data)
 568 -{
 569 -    GError *error = NULL;
 570 -    VirtViewerApp *app = VIRT_VIEWER_APP(user_data);
 571 -
 572 -    if (SPICE_CTRL_IS_CONTROLLER(object))
 573 -        spice_ctrl_controller_listen_finish(SPICE_CTRL_CONTROLLER(object), res, &error);
 574 -    else if (SPICE_CTRL_IS_FOREIGN_MENU(object)) {
 575 -        spice_ctrl_foreign_menu_listen_finish(SPICE_CTRL_FOREIGN_MENU(object), res, &error);
 576 -    } else
 577 -        g_warn_if_reached();
 578 -
 579 -    if (error != NULL) {
 580 -        virt_viewer_app_simple_message_dialog(app,
 581 -                                              _("Controller connection failed: %s"),
 582 -                                              error->message);
 583 -        g_clear_error(&error);
 584 -        exit(EXIT_FAILURE); /* TODO: make start async? */
 585 -    }
 586 -}
 587 -
 588 -
 589 -static gboolean
 590 -remote_viewer_activate(VirtViewerApp *app, GError **error)
 591 -{
 592 -    RemoteViewer *self;
 593 -    gboolean ret = FALSE;
 594 -
 595 -    g_return_val_if_fail(REMOTE_VIEWER_IS(app), FALSE);
 596 -
 597 -    self = REMOTE_VIEWER(app);
 598 -
 599 -    if (self->priv->controller) {
 600 -        SpiceSession *session = remote_viewer_get_spice_session(self);
 601 -        ret = spice_session_connect(session);
 602 -        g_object_unref(session);
 603 -    } else {
 604 -        ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->activate(app, error);
 605 -    }
 606 -
 607 -    return ret;
 608 -}
 609 -
 610 -static void
 611 -remote_viewer_window_added(GtkApplication *app,
 612 -                           GtkWindow *w)
 613 -{
 614 -    VirtViewerWindow *win = VIRT_VIEWER_WINDOW(
 615 -                                g_object_get_data(G_OBJECT(w), "virt-viewer-window"));
 616 -    spice_menu_update(REMOTE_VIEWER(app), win);
 617 -    spice_foreign_menu_update(REMOTE_VIEWER(app), win);
 618 -
 619 -    GTK_APPLICATION_CLASS(remote_viewer_parent_class)->window_added(app, w);
 620 -}
 621  #endif
 622
 623  #ifdef HAVE_OVIRT
 624 @@ -1149,29 +732,8 @@ remote_viewer_start(VirtViewerApp *app, GError **err)
 625      gchar *type = NULL;
 626      GError *error = NULL;
 627
 628 -#ifdef HAVE_SPICE_GTK
 629 -    g_signal_connect(app, "notify", G_CALLBACK(app_notified), self);
 630 -
 631 -    if (priv->controller) {
 632 -        if (!virt_viewer_app_create_session(app, "spice", &error)) {
 633 -            g_debug("Couldn't create a Spice session");
 634 -            goto cleanup;
 635 -        }
 636 -
 637 -        g_signal_connect(priv->controller, "notify", G_CALLBACK(spice_ctrl_notified), self);
 638 -        g_signal_connect(priv->controller, "do_connect", G_CALLBACK(spice_ctrl_do_connect), self);
 639 -        g_signal_connect(priv->controller, "show", G_CALLBACK(spice_ctrl_show), self);
 640 -        g_signal_connect(priv->controller, "hide", G_CALLBACK(spice_ctrl_hide), self);
 641 -
 642 -        spice_ctrl_controller_listen(priv->controller, NULL, spice_ctrl_listen_async_cb, self);
 643 -
 644 -        g_signal_connect(priv->ctrl_foreign_menu, "notify", G_CALLBACK(spice_ctrl_foreign_menu_notified), self);
 645 -        spice_ctrl_foreign_menu_listen(priv->ctrl_foreign_menu, NULL, spice_ctrl_listen_async_cb, self);
 646 -
 647 -        virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Setting up Spice session..."));
 648 -    } else {
 649 -#endif
 650  retry_dialog:
 651 +    {
 652          if (priv->open_recent_dialog) {
 653              VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app);
 654              if (!remote_viewer_connect_dialog(virt_viewer_window_get_window(main_window), &guri)) {
 655