[Spice-commits] src/spice-option.c

[GitLab Mirror]

 src/spice-option.c |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit 7440f67e67d0ee7ab64aefaefe31c5c97750b158
Author: Victor Toso <me at victortoso.com>
Date:   Tue Jan 8 16:39:30 2019 +0100

    option: Remove spice-usbredir-filter option
    
    Deprecated since v0.15 with:
    
        commit 0af80691680be769f3e9d1047ed27a0245cddab3
        Author: Hans de Goede <hdegoede at redhat.com>
        Date:   Thu Oct 11 10:00:02 2012 +0200
    
    Signed-off-by: Victor Toso <victortoso at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/src/spice-option.c b/src/spice-option.c
index 6b400bc..dc5ca4d 100644
--- a/src/spice-option.c
+++ b/src/spice-option.c
@@ -136,18 +136,6 @@ static gboolean parse_secure_channels(const gchar *option_name, const gchar *val
     return TRUE;
 }
 
-
-static gboolean parse_usbredir_filter(const gchar *option_name,
-                                      const gchar *value,
-                                      gpointer data, GError **error)
-
-{
-    g_warning("--spice-usbredir-filter is deprecated, please use --spice-usbredir-auto-redirect-filter instead");
-    g_free(usbredir_auto_redirect_filter);
-    usbredir_auto_redirect_filter = g_strdup(value);
-    return TRUE;
-}
-
 static gboolean parse_preferred_compression(const gchar *option_name, const gchar *value,
                                             gpointer data, GError **error)
 {
@@ -211,9 +199,6 @@ GOptionGroup* spice_get_option_group(void)
           N_("Path to the local certificate database to use for software smartcard certificates"), N_("<certificate-db>") },
         { "spice-disable-usbredir", '\0', 0, G_OPTION_ARG_NONE, &disable_usbredir,
           N_("Disable USB redirection support"), NULL },
-        /* Backward compats version of spice-usbredir-auto-redirect-filter */
-        { "spice-usbredir-filter", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, parse_usbredir_filter,
-          NULL, NULL },
         { "spice-usbredir-auto-redirect-filter", '\0', 0, G_OPTION_ARG_STRING, &usbredir_auto_redirect_filter,
           N_("Filter selecting USB devices to be auto-redirected when plugged in"), N_("<filter-string>") },
         { "spice-usbredir-redirect-on-connect", '\0', 0, G_OPTION_ARG_STRING, &usbredir_redirect_on_connect,