diff --git a/0001-channel-usbredir-Do-not-stop-event-listening-if-Spic.patch b/0001-channel-usbredir-Do-not-stop-event-listening-if-Spic.patch deleted file mode 100644 index dfd326e..0000000 --- a/0001-channel-usbredir-Do-not-stop-event-listening-if-Spic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e3932bfebbfec7637f3d03d90e8f9b75e3223236 Mon Sep 17 00:00:00 2001 -From: Pavel Grunt -Date: Wed, 11 Mar 2015 16:31:39 +0100 -Subject: [spice-gtk] channel-usbredir: Do not stop event listening if - SpiceSession does not exist - -Avoids Segfault when closing the connection just after the usb device redirection. ---- - gtk/channel-usbredir.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gtk/channel-usbredir.c b/gtk/channel-usbredir.c -index b1a91fb..d974434 100644 ---- a/gtk/channel-usbredir.c -+++ b/gtk/channel-usbredir.c -@@ -419,9 +419,12 @@ void spice_usbredir_channel_disconnect_device(SpiceUsbredirChannel *channel) - * usbredirhost_set_device NULL will interrupt the - * libusb_handle_events call in the thread. - */ -- spice_usb_device_manager_stop_event_listening( -- spice_usb_device_manager_get( -- spice_channel_get_session(SPICE_CHANNEL(channel)), NULL)); -+ { -+ SpiceSession *session = spice_channel_get_session(SPICE_CHANNEL(channel)); -+ if (session != NULL) -+ spice_usb_device_manager_stop_event_listening( -+ spice_usb_device_manager_get(session, NULL)); -+ } - /* This also closes the libusb handle we passed from open_device */ - usbredirhost_set_device(priv->host, NULL); - libusb_unref_device(priv->device); diff --git a/0002-audio-channel-new-handler-to-be-after-default-handle.patch b/0002-audio-channel-new-handler-to-be-after-default-handle.patch deleted file mode 100644 index efef9c3..0000000 --- a/0002-audio-channel-new-handler-to-be-after-default-handle.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 81d8175d9d6a8297b10cead6c951bf560f61be4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 28 Apr 2015 14:30:28 +0200 -Subject: [PATCH spice-gtk] audio: channel-new handler to be after default - handlers - -Client usually connect to channel-new to connect their -handlers, such as open-fd. - -The audio channel-new handler will call channel_connect() on audio -channels, which may call open-fd. - -However, open-fd can be emitted before the client had a chance to -connect their handlers (from the channel-new callback). - -Connecting after the default handler solves this case. - -Fixes: -https://bugzilla.gnome.org/show_bug.cgi?id=747649 ---- - gtk/spice-audio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c -index 7784c8b..ce191e1 100644 ---- a/gtk/spice-audio.c -+++ b/gtk/spice-audio.c -@@ -267,7 +267,7 @@ SpiceAudio *spice_audio_new(SpiceSession *session, GMainContext *context, - return NULL; - - spice_g_signal_connect_object(session, "notify::enable-audio", G_CALLBACK(session_enable_audio), self, 0); -- spice_g_signal_connect_object(session, "channel-new", G_CALLBACK(channel_new), self, 0); -+ spice_g_signal_connect_object(session, "channel-new", G_CALLBACK(channel_new), self, G_CONNECT_AFTER); - update_audio_channels(self, session); - - return self; --- -2.1.0 - diff --git a/0003-usb-channel-new-handler-to-be-after-default-handlers.patch b/0003-usb-channel-new-handler-to-be-after-default-handlers.patch deleted file mode 100644 index d787cbf..0000000 --- a/0003-usb-channel-new-handler-to-be-after-default-handlers.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9546b571d7143e4c9efcb022d6016ea1c9ed2536 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 28 Apr 2015 14:30:28 +0200 -Subject: [PATCH spice-gtk] usb: channel-new handler to be after default - handlers - -Client usually connect to channel-new to connect their -handlers, such as open-fd. - -The usbmanager channel-new handler will call channel_connect() on usbredir -channels, which may call open-fd. - -However, open-fd can be emitted before the client had a chance to -connect their handlers (from the channel-new callback). - -Connecting after the default handler solves this case. - -Fixes: -https://bugzilla.gnome.org/show_bug.cgi?id=748665 ---- - gtk/usb-device-manager.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gtk/usb-device-manager.c b/gtk/usb-device-manager.c -index e11eae0..7aa60c4 100644 ---- a/gtk/usb-device-manager.c -+++ b/gtk/usb-device-manager.c -@@ -310,8 +310,7 @@ static gboolean spice_usb_device_manager_initable_init(GInitable *initable, - #endif - - /* Start listening for usb channels connect/disconnect */ -- g_signal_connect(priv->session, "channel-new", -- G_CALLBACK(channel_new), self); -+ spice_g_signal_connect_object(priv->session, "channel-new", G_CALLBACK(channel_new), self, G_CONNECT_AFTER); - g_signal_connect(priv->session, "channel-destroy", - G_CALLBACK(channel_destroy), self); - list = spice_session_get_channels(priv->session); --- -2.1.0 -