[vte] Move deprecated stuff out of vte.h
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] Move deprecated stuff out of vte.h
- Date: Wed, 24 Mar 2010 13:13:09 +0000 (UTC)
commit 8d263ba855ca6cbf741fc9cdfc921963be63991c
Author: Christian Persch <chpe gnome org>
Date: Wed Mar 24 14:10:47 2010 +0100
Move deprecated stuff out of vte.h
... and into vtedeprecated.h. This way it won't end up in the GIR.
src/Makefile.am | 3 +-
src/vte.h | 78 ++----------------------------------------
src/vtedeprecated.h | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+), 75 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index dbbe58d..bd8103d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = iso2022.txt
# The library
-pkginclude_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h
+pkginclude_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h vtedeprecated.h
lib_LTLIBRARIES = libvte.la
@@ -64,6 +64,7 @@ libvte_la_SOURCES = \
vteconv.h \
vtedraw.c \
vtedraw.h \
+ vtedeprecated.h \
vteint.h \
vtepty.h \
vtepty-private.h \
diff --git a/src/vte.h b/src/vte.h
index 1bf55e3..666ef29 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -481,83 +481,13 @@ gboolean vte_terminal_write_contents (VteTerminal *terminal,
GCancellable *cancellable,
GError **error);
-
-#ifndef VTE_DISABLE_DEPRECATED
-
-G_END_DECLS
-#include <sys/types.h> /* for pid_t */
-G_BEGIN_DECLS
-
-/**
- * VTE_IS_TERMINAL_ERASE_BINDING:
- *
- * Does nothing.
- *
- * Returns: %FALSE
- *
- * @Deprecated: 0.20
- */
-#define VTE_IS_TERMINAL_ERASE_BINDING(obj) (FALSE)
-
-/**
- * VTE_IS_TERMINAL_ANTI_ALIAS:
- *
- * Does nothing.
- *
- * Returns: %FALSE
- *
- * @Deprecated: 0.20
- */
-#define VTE_IS_TERMINAL_ANTI_ALIAS(obj) (FALSE)
-
-/**
- * VteTerminalAntiAlias:
- * @VTE_ANTI_ALIAS_USE_DEFAULT: Use the system default anti-alias setting
- * @VTE_ANTI_ALIAS_FORCE_ENABLE: Force enable anti-aliasing
- * @VTE_ANTI_ALIAS_FORCE_DISABLE: Force disable anti-aliasing
- *
- * An enumeration describing which anti-alias setting to use.
- *
- * @Deprecated: 0.20
- */
-typedef enum {
- VTE_ANTI_ALIAS_USE_DEFAULT,
- VTE_ANTI_ALIAS_FORCE_ENABLE,
- VTE_ANTI_ALIAS_FORCE_DISABLE
-} VteTerminalAntiAlias;
-
-void vte_terminal_set_cursor_blinks(VteTerminal *terminal,
- gboolean blink) G_GNUC_DEPRECATED;
-gboolean vte_terminal_get_using_xft(VteTerminal *terminal) G_GNUC_DEPRECATED;
-int vte_terminal_match_add(VteTerminal *terminal, const char *match) G_GNUC_DEPRECATED;
-glong vte_terminal_get_char_descent(VteTerminal *terminal) G_GNUC_DEPRECATED;
-glong vte_terminal_get_char_ascent(VteTerminal *terminal) G_GNUC_DEPRECATED;
-void vte_terminal_set_font_full(VteTerminal *terminal,
- const PangoFontDescription *font_desc,
- VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
-void vte_terminal_set_font_from_string_full(VteTerminal *terminal,
- const char *name,
- VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
-pid_t vte_terminal_fork_command(VteTerminal *terminal,
- const char *command, char **argv,
- char **envv, const char *working_directory,
- gboolean lastlog,
- gboolean utmp,
- gboolean wtmp) G_GNUC_DEPRECATED;
-pid_t vte_terminal_forkpty(VteTerminal *terminal,
- char **envv, const char *working_directory,
- gboolean lastlog,
- gboolean utmp,
- gboolean wtmp) G_GNUC_DEPRECATED;
-void vte_terminal_get_padding(VteTerminal *terminal, int *xpad, int *ypad) G_GNUC_DEPRECATED;
-void vte_terminal_set_pty(VteTerminal *terminal, int pty_master);
-int vte_terminal_get_pty(VteTerminal *terminal);
-
-#endif /* VTE_DISABLE_DEPRECATED */
-
#undef _VTE_SEAL
#undef _VTE_DEPRECATED
G_END_DECLS
+#ifndef VTE_DISABLE_DEPRECATED
+#include "vtedeprecated.h"
+#endif /* VTE_DISABLE_DEPRECATED */
+
#endif
diff --git a/src/vtedeprecated.h b/src/vtedeprecated.h
new file mode 100644
index 0000000..ca34201
--- /dev/null
+++ b/src/vtedeprecated.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2001,2002,2003,2009,2010 Red Hat, Inc.
+ *
+ * This is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef vte_deprecated_h_included
+#define vte_deprecated_h_included
+
+#include <sys/types.h> /* for pid_t */
+
+G_BEGIN_DECLS
+
+/**
+ * VTE_IS_TERMINAL_ERASE_BINDING:
+ *
+ * Does nothing.
+ *
+ * Returns: %FALSE
+ *
+ * @Deprecated: 0.20
+ */
+#define VTE_IS_TERMINAL_ERASE_BINDING(obj) (FALSE)
+
+/**
+ * VTE_IS_TERMINAL_ANTI_ALIAS:
+ *
+ * Does nothing.
+ *
+ * Returns: %FALSE
+ *
+ * @Deprecated: 0.20
+ */
+#define VTE_IS_TERMINAL_ANTI_ALIAS(obj) (FALSE)
+
+/**
+ * VteTerminalAntiAlias:
+ * @VTE_ANTI_ALIAS_USE_DEFAULT: Use the system default anti-alias setting
+ * @VTE_ANTI_ALIAS_FORCE_ENABLE: Force enable anti-aliasing
+ * @VTE_ANTI_ALIAS_FORCE_DISABLE: Force disable anti-aliasing
+ *
+ * An enumeration describing which anti-alias setting to use.
+ *
+ * @Deprecated: 0.20
+ */
+typedef enum {
+ VTE_ANTI_ALIAS_USE_DEFAULT,
+ VTE_ANTI_ALIAS_FORCE_ENABLE,
+ VTE_ANTI_ALIAS_FORCE_DISABLE
+} VteTerminalAntiAlias;
+
+void vte_terminal_set_cursor_blinks(VteTerminal *terminal,
+ gboolean blink) G_GNUC_DEPRECATED;
+gboolean vte_terminal_get_using_xft(VteTerminal *terminal) G_GNUC_DEPRECATED;
+int vte_terminal_match_add(VteTerminal *terminal, const char *match) G_GNUC_DEPRECATED;
+glong vte_terminal_get_char_descent(VteTerminal *terminal) G_GNUC_DEPRECATED;
+glong vte_terminal_get_char_ascent(VteTerminal *terminal) G_GNUC_DEPRECATED;
+void vte_terminal_set_font_full(VteTerminal *terminal,
+ const PangoFontDescription *font_desc,
+ VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
+void vte_terminal_set_font_from_string_full(VteTerminal *terminal,
+ const char *name,
+ VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
+pid_t vte_terminal_fork_command(VteTerminal *terminal,
+ const char *command, char **argv,
+ char **envv, const char *working_directory,
+ gboolean lastlog,
+ gboolean utmp,
+ gboolean wtmp) G_GNUC_DEPRECATED;
+pid_t vte_terminal_forkpty(VteTerminal *terminal,
+ char **envv, const char *working_directory,
+ gboolean lastlog,
+ gboolean utmp,
+ gboolean wtmp) G_GNUC_DEPRECATED;
+void vte_terminal_get_padding(VteTerminal *terminal, int *xpad, int *ypad) G_GNUC_DEPRECATED;
+void vte_terminal_set_pty(VteTerminal *terminal, int pty_master);
+int vte_terminal_get_pty(VteTerminal *terminal);
+
+G_END_DECLS
+
+#endif /* !vte_deprecated_h_included */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]