[Spice-devel] [PATCH spice-gtk] Do not warn when starting spicy if usbredir is disabled

[Marc-André Lureau]

---
 gtk/spicy.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gtk/spicy.c b/gtk/spicy.c
index 0486610..aa00582 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -776,9 +776,7 @@ static const char *spice_display_properties[] = {
 
 static const char *spice_gtk_session_properties[] = {
     "auto-clipboard",
-#ifdef USE_USBREDIR
     "auto-usbredir",
-#endif
 };
 
 static const GtkToggleActionEntry tentries[] = {
@@ -807,12 +805,10 @@ static const GtkToggleActionEntry tentries[] = {
         .label       = N_("Automagic clipboard sharing between host and guest"),
         .callback    = G_CALLBACK(menu_cb_bool_prop),
     },{
-#ifdef USE_USBREDIR
         .name        = "auto-usbredir",
         .label       = N_("Auto redirect newly plugged in USB devices"),
         .callback    = G_CALLBACK(menu_cb_bool_prop),
     },{
-#endif
         .name        = "Statusbar",
         .label       = N_("Statusbar"),
         .callback    = G_CALLBACK(menu_cb_statusbar),
@@ -858,9 +854,7 @@ static char ui_xml[] =
 "      <menuitem action='scaling'/>\n"
 "      <menuitem action='disable-inputs'/>\n"
 "      <menuitem action='auto-clipboard'/>\n"
-#ifdef USE_USBREDIR
 "      <menuitem action='auto-usbredir'/>\n"
-#endif
 "    </menu>\n"
 "    <menu action='HelpMenu'>\n"
 "      <menuitem action='About'/>\n"
@@ -1283,6 +1277,11 @@ static spice_window *create_spice_window(spice_connection *conn, int id, SpiceCh
     }
 #endif
 
+#ifndef USE_USBREDIR
+    GtkAction *usbredir = gtk_action_group_get_action(win->ag, "auto-usbredir");
+    gtk_action_set_visible(usbredir, FALSE);
+#endif
+
     gtk_widget_grab_focus(win->spice);
 
     return win;
-- 
1.7.7.6