]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
ui/gtk: Fix deprecation of vte_terminal_copy_clipboard stable-4.8 staging-4.8 qemu-xen-4.8.3 qemu-xen-4.8.4 qemu-xen-4.8.5
authorAnthony PERARD <anthony.perard@citrix.com>
Tue, 10 Oct 2017 10:24:18 +0000 (11:24 +0100)
committerAnthony PERARD <anthony.perard@citrix.com>
Thu, 9 Nov 2017 16:03:11 +0000 (16:03 +0000)
vte_terminal_copy_clipboard() is deprecated in VTE 0.50.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit 70857ad6212276dcda364e36b30258222bdb31bc)

ui/gtk.c

index 58d20eed62d240ad25937b8bf9235b353aa98987..0d74bbf25f6ba53ea77882ef0b7ab46e134f31f3 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1636,7 +1636,12 @@ static void gd_menu_copy(GtkMenuItem *item, void *opaque)
     GtkDisplayState *s = opaque;
     VirtualConsole *vc = gd_vc_find_current(s);
 
+#if VTE_CHECK_VERSION(0, 50, 0)
+    vte_terminal_copy_clipboard_format(VTE_TERMINAL(vc->vte.terminal),
+                                       VTE_FORMAT_TEXT);
+#else
     vte_terminal_copy_clipboard(VTE_TERMINAL(vc->vte.terminal));
+#endif
 }
 
 static void gd_vc_adjustment_changed(GtkAdjustment *adjustment, void *opaque)