ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

[Qemu-devel] [PATCH] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

Anthony PERARD posted 1 patch 6 years, 6 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171010102418.13487-1-anthony.perard@citrix.com

Test checkpatch passed

Test docker passed

Test s390x passed

ui/gtk.c | 5 +++++
1 file changed, 5 insertions(+)

Expand all Fold all

[Qemu-devel] [PATCH] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

Posted by Anthony PERARD 6 years, 6 months ago

vte_terminal_copy_clipboard() is deprecated in VTE 0.50.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 ui/gtk.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/gtk.c b/ui/gtk.c
index 5bd87c265a..342e96fbe9 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1702,7 +1702,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)
-- 
Anthony PERARD

Re: [Qemu-devel] [PATCH] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

Posted by Daniel P. Berrange 6 years, 6 months ago

On Tue, Oct 10, 2017 at 11:24:18AM +0100, Anthony PERARD wrote:
> vte_terminal_copy_clipboard() is deprecated in VTE 0.50.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  ui/gtk.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 5bd87c265a..342e96fbe9 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -1702,7 +1702,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)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|