From: Victor Toso <me@xxxxxxxxxxxxxx>
Commit 284c1f2d switched to
spice_main_channel_clipboard_selection_release() which does check if
agent is connected and does the right thing (expected) in regards to
releasing the clipboard by calling agent_clipboard_release() which
does check VD_AGENT_CAP_CLIPBOARD_SELECTION (like current removed
code).
So this patch removes redundant check.
Same goes for spice_main_channel_clipboard_selection_grab() function.
Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx>
---
src/spice-gtk-session.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
index 373d11e..c7e6e24 100644
--- a/src/spice-gtk-session.c
+++ b/src/spice-gtk-session.c
@@ -610,9 +610,7 @@ static void clipboard_get_targets(GtkClipboard *clipboard,
}
s->clip_grabbed[selection] = TRUE;
-
- if (spice_main_channel_agent_test_capability(s->main, VD_AGENT_CAP_CLIPBOARD_BY_DEMAND))
- spice_main_channel_clipboard_selection_grab(s->main, selection, types, num_types);
+ spice_main_channel_clipboard_selection_grab(s->main, selection, types, num_types);
/* Sending a grab causes the agent to do an implicit release */
s->nclip_targets[selection] = 0;
@@ -636,8 +634,7 @@ static void clipboard_owner_change(GtkClipboard *clipboard,
if (s->clip_grabbed[selection]) {
s->clip_grabbed[selection] = FALSE;
- if (spice_main_channel_agent_test_capability(s->main, VD_AGENT_CAP_CLIPBOARD_BY_DEMAND))
- spice_main_channel_clipboard_selection_release(s->main, selection);
+ spice_main_channel_clipboard_selection_release(s->main, selection);
}
switch (event->reason) {
--
2.19.2
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel