qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cole Robinson <crobinso@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	Anthony Liguori <aliguori@amazon.com>,
	Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PATCH 2/6] gtk: Don't use deprecated vte_terminal_get_adjustment
Date: Wed, 12 Mar 2014 16:40:15 -0400	[thread overview]
Message-ID: <53fb95ab86dcc7fb1aba6661c7e62529b61bdd45.1394656582.git.crobinso@redhat.com> (raw)
In-Reply-To: <cover.1394656582.git.crobinso@redhat.com>
In-Reply-To: <cover.1394656582.git.crobinso@redhat.com>

Guard this with a VTE version check, since I'm not sure if this is backwards
compatible.

ui/gtk.c: In function ‘gd_vc_init’:
ui/gtk.c:1176:5: error: ‘vte_terminal_get_adjustment’ is deprecated (declared at /usr/include/vte-2.90/vte/vtedeprecated.h:101) [-Werror=deprecated-declarations]

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 ui/gtk.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/gtk.c b/ui/gtk.c
index 3879945..2a9b8c3 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1173,7 +1173,11 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
 
     vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->terminal), -1);
 
+#if VTE_CHECK_VERSION(0, 28, 0)
+    vadjustment = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vc->terminal));
+#else
     vadjustment = vte_terminal_get_adjustment(VTE_TERMINAL(vc->terminal));
+#endif
 
     scrolled_window = gtk_scrolled_window_new(NULL, vadjustment);
     gtk_container_add(GTK_CONTAINER(scrolled_window), vc->terminal);
-- 
1.8.5.3

  parent reply	other threads:[~2014-03-12 20:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-12 20:40 [Qemu-devel] [PATCH 0/6] gtk: A few bug fixes Cole Robinson
2014-03-12 20:40 ` [Qemu-devel] [PATCH 1/6] gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic Cole Robinson
2014-03-12 20:40 ` Cole Robinson [this message]
2014-03-12 20:40 ` [Qemu-devel] [PATCH 3/6] gtk: Remove use of deprecated stock items Cole Robinson
2014-03-12 20:40 ` [Qemu-devel] [PATCH 4/6] gtk: Use ctrl+alt+q for quit accelerator Cole Robinson
2014-03-12 20:40 ` [Qemu-devel] [PATCH 5/6] gtk: Fix mouse warping with gtk3 Cole Robinson
2014-03-12 20:40 ` [Qemu-devel] [PATCH 6/6] gtk: Don't warp absolute pointer Cole Robinson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53fb95ab86dcc7fb1aba6661c7e62529b61bdd45.1394656582.git.crobinso@redhat.com \
    --to=crobinso@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).