[vte/vte-0-36] build: Ignore deprecations
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-0-36] build: Ignore deprecations
- Date: Sun, 20 Oct 2013 20:31:31 +0000 (UTC)
commit 513c60e23e4cb3cdd4903936073993e9eae4a49f
Author: Christian Persch <chpe gnome org>
Date: Sun Oct 20 22:30:00 2013 +0200
build: Ignore deprecations
It's just cluttering the output too much, and all of these are already fixed
on vte-next. For this branch, just ignore the deprecations.
src/Makefile.am | 2 ++
src/vte.c | 12 ++++++++++++
src/vteapp.c | 10 +++++++++-
3 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 53e7482..49474d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,6 +98,8 @@ libvte VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \
-DLOCALEDIR='"$(localedir)"' \
+ -DG_DISABLE_DEPRECATION_WARNINGS \
+ -DGDK_DISABLE_DEPRECATION_WARNINGS \
-DVTE_COMPILATION \
$(AM_CPPFLAGS)
diff --git a/src/vte.c b/src/vte.c
index d41006e..3fb003b 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -11669,22 +11669,34 @@ vte_terminal_set_property (GObject *object,
vte_terminal_set_audible_bell (terminal, g_value_get_boolean (value));
break;
case PROP_BACKGROUND_IMAGE_FILE:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_background_image_file (terminal, g_value_get_string (value));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKGROUND_IMAGE_PIXBUF:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_background_image (terminal, g_value_get_object (value));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKGROUND_OPACITY:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_opacity (terminal, g_value_get_double (value) * (double)
G_MAXUINT16);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKGROUND_SATURATION:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_background_saturation (terminal, g_value_get_double (value));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKGROUND_TINT_COLOR:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_background_tint_color (terminal, g_value_get_boxed (value));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKGROUND_TRANSPARENT:
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_background_transparent (terminal, g_value_get_boolean (value));
+ G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case PROP_BACKSPACE_BINDING:
vte_terminal_set_backspace_binding (terminal, g_value_get_enum (value));
diff --git a/src/vteapp.c b/src/vteapp.c
index 10070ab..822d8c2 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -891,11 +891,13 @@ main(int argc, char **argv)
vte_terminal_set_audible_bell(terminal, audible);
vte_terminal_set_visible_bell(terminal, !audible);
vte_terminal_set_cursor_blink_mode(terminal, cursor_blink_mode);
- vte_terminal_set_scroll_background(terminal, scroll);
vte_terminal_set_scroll_on_output(terminal, FALSE);
vte_terminal_set_scroll_on_keystroke(terminal, TRUE);
vte_terminal_set_scrollback_lines(terminal, lines);
vte_terminal_set_mouse_autohide(terminal, TRUE);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ vte_terminal_set_scroll_background(terminal, scroll);
if (background != NULL) {
vte_terminal_set_background_image_file(terminal,
background);
@@ -906,6 +908,8 @@ main(int argc, char **argv)
vte_terminal_set_background_tint_color(terminal, &tint);
vte_terminal_set_opacity(terminal, 0xdddd);
}
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+
vte_terminal_set_colors(terminal, &fore, &back, NULL, 0);
if (highlight_set) {
vte_terminal_set_color_highlight(terminal,
@@ -920,8 +924,10 @@ main(int argc, char **argv)
vte_terminal_set_cursor_shape(terminal, cursor_shape);
/* Set the default font. */
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
vte_terminal_set_font_from_string_full(terminal, font,
antialias ? VTE_ANTI_ALIAS_USE_DEFAULT :
VTE_ANTI_ALIAS_FORCE_DISABLE);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
/* Match "abcdefg". */
if (dingus) {
@@ -1028,9 +1034,11 @@ main(int argc, char **argv)
#endif
} else {
long i;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
i = vte_terminal_forkpty(terminal,
env_add, working_directory,
TRUE, TRUE, TRUE);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
switch (i) {
case -1:
/* abnormal */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]