<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Aug 11, 2015, at 13:58 PM, Christophe Fergeau <<a href="mailto:cfergeau@redhat.com" class="">cfergeau@redhat.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">On Mon, Aug 03, 2015 at 04:10:51PM +0300, Kirill Moizik wrote:</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">From: Kirill Moizik <<a href="mailto:kmoizik@redhat.com" class="">kmoizik@redhat.com</a>><br class=""><br class="">---<br class="">src/usb-device-widget.c | 46 ++++++++++++++++++++++++++--------------------<br class="">1 file changed, 26 insertions(+), 20 deletions(-)<br class=""><br class="">diff --git a/src/usb-device-widget.c b/src/usb-device-widget.c<br class="">index 4d66e12..fcafc92 100644<br class="">--- a/src/usb-device-widget.c<br class="">+++ b/src/usb-device-widget.c<br class="">@@ -366,33 +366,39 @@ static void check_can_redirect(GtkWidget *widget, gpointer user_data)<br class=""> SpiceUsbDevice *device;<br class=""> gboolean can_redirect;<br class=""> GError *err = NULL;<br class="">+ gboolean redirecting;<br class="">+ g_object_get(priv->manager, "redirecting", &redirecting, NULL);<br class=""><br class=""> device = get_usb_device(widget);<br class=""> if (!device)<br class=""> return; /* Non device widget, ie the info_bar */<br class=""><br class="">- priv->device_count++;<br class="">- can_redirect = spice_usb_device_manager_can_redirect_device(priv->manager,<br class="">- device, &err);<br class="">- gtk_widget_set_sensitive(widget, can_redirect);<br class="">-<br class="">- /* If we cannot redirect this device, append the error message to<br class="">- err_msg, but only if it is *not* already there! */<br class="">- if (!can_redirect) {<br class="">- if (priv->err_msg) {<br class="">- if (!strstr(priv->err_msg, err->message)) {<br class="">- gchar *old_err_msg = priv->err_msg;<br class="">+ if (redirecting) {<br class="">+ // if we are at redirecting state, then there is at least one usb device<br class="">+ priv->device_count++;<br class="">+ can_redirect = FALSE;<br class=""></blockquote><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Imo this should be handled by</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">spice_usb_device_manager_can_redirect_device() (this can have a special</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">error-code which is filtered out).</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""></div></blockquote><div><br class=""></div><div><div>I tried to do like you suggested but didn’t like it because it makes interface</div></div><div>of spice_usb_device_manager_can_redirect_device() ugly.</div><div><br class=""></div><div><div><div>Also “is redirection in progress” is a temporary system property, not a permanent per-device one.</div><div class=""><br class=""></div></div></div><div>I’d leave this untouched.</div><br class=""><blockquote type="cite" class=""><div class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: inline !important;" class="">Christophe</span><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><br style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">+ } else {<br class=""><br class="">- priv->err_msg = g_strdup_printf("%s\n%s", priv->err_msg,<br class="">- err->message);<br class="">- g_free(old_err_msg);<br class="">+ priv->device_count++;<br class="">+ can_redirect = spice_usb_device_manager_can_redirect_device(priv->manager,<br class="">+ device, &err);<br class="">+ /* If we cannot redirect this device, append the error message to<br class="">+ err_msg, but only if it is *not* already there! */<br class="">+ if (!can_redirect) {<br class="">+ if (priv->err_msg) {<br class="">+ if (!strstr(priv->err_msg, err->message)) {<br class="">+ gchar *old_err_msg = priv->err_msg;<br class="">+ priv->err_msg = g_strdup_printf("%s\n%s", priv->err_msg,<br class="">+ err->message);<br class="">+ g_free(old_err_msg);<br class="">+ }<br class="">+ } else {<br class="">+ priv->err_msg = g_strdup(err->message);<br class=""> }<br class="">- } else {<br class="">- priv->err_msg = g_strdup(err->message);<br class=""> }<br class="">+ g_clear_error(&err);<br class=""> }<br class="">-<br class="">- g_clear_error(&err);<br class="">+ gtk_widget_set_sensitive(widget, can_redirect);<br class="">}<br class=""><br class="">static gboolean spice_usb_device_widget_update_status(gpointer user_data)<br class="">@@ -455,9 +461,9 @@ static void connect_cb(GObject *gobject, GAsyncResult *res, gpointer user_data)<br class=""> g_error_free(err);<br class=""><br class=""> gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->check), FALSE);<br class="">- spice_usb_device_widget_update_status(self);<br class="">- }<br class=""><br class="">+ }<br class="">+ spice_usb_device_widget_update_status(self);<br class=""> g_object_unref(data->check);<br class=""> g_object_unref(data->self);<br class=""> g_free(data);<br class="">--<span class="Apple-converted-space"> </span><br class="">2.4.3<br class=""><br class="">_______________________________________________<br class="">Spice-devel mailing list<br class=""><a href="mailto:Spice-devel@lists.freedesktop.org" class="">Spice-devel@lists.freedesktop.org</a><br class="">http://lists.freedesktop.org/mailman/listinfo/spice-devel</blockquote></div></blockquote></div><br class=""></body></html>