[vte] all: Fix namespace for attributes macros



commit 52662317e154fbc1ca094d8dd2bf54c62e376ec7
Author: Christian Persch <chpe gnome org>
Date:   Mon May 5 09:17:08 2014 +0200

    all: Fix namespace for attributes macros
    
    They are only there to be used in our headers, they are not
    part of our API. So prefix them with an underscore.

 src/vtemacros.h   |    8 +-
 src/vtepty.h      |   14 ++--
 src/vterowdata.h  |    4 +-
 src/vteterminal.h |  170 ++++++++++++++++++++++++++--------------------------
 4 files changed, 98 insertions(+), 98 deletions(-)
---
diff --git a/src/vtemacros.h b/src/vtemacros.h
index 7e898b9..121eaf5 100644
--- a/src/vtemacros.h
+++ b/src/vtemacros.h
@@ -24,15 +24,15 @@
 #endif
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 6)
-#define VTE_GNUC_PACKED __attribute__((__packed__))
+#define _VTE_GNUC_PACKED __attribute__((__packed__))
 #else
-#define VTE_GNUC_PACKED
+#define _VTE_GNUC_PACKED
 #endif  /* !__GNUC__ */
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-#define VTE_GNUC_NONNULL(position) __attribute__((__nonnull__(position)))
+#define _VTE_GNUC_NONNULL(position) __attribute__((__nonnull__(position)))
 #else
-#define VTE_GNUC_NONNULL(position)
+#define _VTE_GNUC_NONNULL(position)
 #endif
 
 #endif /* __VTE_VTE_MACROS_H__ */
diff --git a/src/vtepty.h b/src/vtepty.h
index 170b7cb..d1115f9 100644
--- a/src/vtepty.h
+++ b/src/vtepty.h
@@ -66,28 +66,28 @@ VtePty *vte_pty_new_foreign_sync (int fd,
                                   GCancellable *cancellable,
                                   GError **error);
 
-int vte_pty_get_fd (VtePty *pty) VTE_GNUC_NONNULL(1);
+int vte_pty_get_fd (VtePty *pty) _VTE_GNUC_NONNULL(1);
 
-void vte_pty_close (VtePty *pty) VTE_GNUC_NONNULL(1);
+void vte_pty_close (VtePty *pty) _VTE_GNUC_NONNULL(1);
 
-void vte_pty_child_setup (VtePty *pty) VTE_GNUC_NONNULL(1);
+void vte_pty_child_setup (VtePty *pty) _VTE_GNUC_NONNULL(1);
 
 gboolean vte_pty_get_size (VtePty *pty,
                            int *rows,
                            int *columns,
-                           GError **error) VTE_GNUC_NONNULL(1);
+                           GError **error) _VTE_GNUC_NONNULL(1);
 
 gboolean vte_pty_set_size (VtePty *pty,
                            int rows,
                            int columns,
-                           GError **error) VTE_GNUC_NONNULL(1);
+                           GError **error) _VTE_GNUC_NONNULL(1);
 
 gboolean vte_pty_set_utf8 (VtePty *pty,
                            gboolean utf8,
-                           GError **error) VTE_GNUC_NONNULL(1);
+                           GError **error) _VTE_GNUC_NONNULL(1);
 
 void vte_pty_set_term (VtePty *pty,
-                       const char *emulation) VTE_GNUC_NONNULL(1);
+                       const char *emulation) _VTE_GNUC_NONNULL(1);
 
 G_END_DECLS
 
diff --git a/src/vterowdata.h b/src/vterowdata.h
index 8ec734d..7dfda99 100644
--- a/src/vterowdata.h
+++ b/src/vterowdata.h
@@ -80,7 +80,7 @@ G_STATIC_ASSERT (sizeof (VteCellAttr) == sizeof (VteIntCellAttr));
  * VteCell: A single cell's data
  */
 
-typedef struct VTE_GNUC_PACKED _VteCell {
+typedef struct _VTE_GNUC_PACKED _VteCell {
        vteunistr c;
        VteCellAttr attr;
 } VteCell;
@@ -88,7 +88,7 @@ G_STATIC_ASSERT (sizeof (VteCell) == 12);
 
 typedef union _VteIntCell {
        VteCell cell;
-       struct VTE_GNUC_PACKED {
+       struct _VTE_GNUC_PACKED {
                guint32 c;
                guint64 attr;
        } i;
diff --git a/src/vteterminal.h b/src/vteterminal.h
index d412a59..c7e216a 100644
--- a/src/vteterminal.h
+++ b/src/vteterminal.h
@@ -124,7 +124,7 @@ struct _VteCharAttributes {
 typedef gboolean (*VteSelectionFunc)(VteTerminal *terminal,
                                      glong column,
                                      glong row,
-                                     gpointer data) VTE_GNUC_NONNULL(1);
+                                     gpointer data) _VTE_GNUC_NONNULL(1);
 
 /* The widget's type. */
 GType vte_terminal_get_type(void);
@@ -134,10 +134,10 @@ GtkWidget *vte_terminal_new(void);
 VtePty *vte_terminal_pty_new_sync (VteTerminal *terminal,
                                    VtePtyFlags flags,
                                    GCancellable *cancellable,
-                                   GError **error) VTE_GNUC_NONNULL(1);
+                                   GError **error) _VTE_GNUC_NONNULL(1);
 
 void vte_terminal_watch_child (VteTerminal *terminal,
-                               GPid child_pid) VTE_GNUC_NONNULL(1);
+                               GPid child_pid) _VTE_GNUC_NONNULL(1);
 
 gboolean vte_terminal_spawn_sync(VteTerminal *terminal,
                                  VtePtyFlags pty_flags,
@@ -149,116 +149,116 @@ gboolean vte_terminal_spawn_sync(VteTerminal *terminal,
                                  gpointer child_setup_data,
                                  GPid *child_pid /* out */,
                                  GCancellable *cancellable,
-                                 GError **error) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(4);
+                                 GError **error) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(4);
 
 /* Send data to the terminal to display, or to the terminal's forked command
  * to handle in some way.  If it's 'cat', they should be the same. */
 void vte_terminal_feed(VteTerminal *terminal,
                        const char *data,
-                       gssize length) VTE_GNUC_NONNULL(1);
+                       gssize length) _VTE_GNUC_NONNULL(1);
 void vte_terminal_feed_child(VteTerminal *terminal,
                              const char *text,
-                             gssize length) VTE_GNUC_NONNULL(1);
+                             gssize length) _VTE_GNUC_NONNULL(1);
 void vte_terminal_feed_child_binary(VteTerminal *terminal,
                                     const guint8 *data,
-                                    gsize length) VTE_GNUC_NONNULL(1);
+                                    gsize length) _VTE_GNUC_NONNULL(1);
 
 /* Copy currently-selected text to the clipboard, or from the clipboard to
  * the terminal. */
-void vte_terminal_copy_clipboard(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-void vte_terminal_paste_clipboard(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-void vte_terminal_copy_primary(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-void vte_terminal_paste_primary(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+void vte_terminal_copy_clipboard(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+void vte_terminal_paste_clipboard(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+void vte_terminal_copy_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
-void vte_terminal_select_all(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-void vte_terminal_unselect_all(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set the terminal's size. */
 void vte_terminal_set_size(VteTerminal *terminal,
-                          glong columns, glong rows) VTE_GNUC_NONNULL(1);
+                          glong columns, glong rows) _VTE_GNUC_NONNULL(1);
 
 void vte_terminal_set_font_scale(VteTerminal *terminal,
-                                 gdouble scale) VTE_GNUC_NONNULL(1);
-gdouble vte_terminal_get_font_scale(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                 gdouble scale) _VTE_GNUC_NONNULL(1);
+gdouble vte_terminal_get_font_scale(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set various on-off settings. */
 void vte_terminal_set_audible_bell(VteTerminal *terminal,
-                                   gboolean is_audible) VTE_GNUC_NONNULL(1);
+                                   gboolean is_audible) _VTE_GNUC_NONNULL(1);
 gboolean vte_terminal_get_audible_bell(VteTerminal *terminal);
 void vte_terminal_set_visible_bell(VteTerminal *terminal,
-                                   gboolean is_visible) VTE_GNUC_NONNULL(1);
+                                   gboolean is_visible) _VTE_GNUC_NONNULL(1);
 gboolean vte_terminal_get_visible_bell(VteTerminal *terminal);
 void vte_terminal_set_scroll_on_output(VteTerminal *terminal,
-                                       gboolean scroll) VTE_GNUC_NONNULL(1);
+                                       gboolean scroll) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal,
                                          gboolean scroll);
 void vte_terminal_set_rewrap_on_resize(VteTerminal *terminal,
-                                       gboolean rewrap) VTE_GNUC_NONNULL(1);
-gboolean vte_terminal_get_rewrap_on_resize(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                       gboolean rewrap) _VTE_GNUC_NONNULL(1);
+gboolean vte_terminal_get_rewrap_on_resize(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set the color scheme. */
 void vte_terminal_set_color_bold(VteTerminal *terminal,
-                                 const GdkRGBA *bold) VTE_GNUC_NONNULL(1);
+                                 const GdkRGBA *bold) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_color_dim(VteTerminal *terminal,
-                                const GdkRGBA *dim) VTE_GNUC_NONNULL(1);
+                                const GdkRGBA *dim) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_color_foreground(VteTerminal *terminal,
-                                       const GdkRGBA *foreground) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2);
+                                       const GdkRGBA *foreground) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 void vte_terminal_set_color_background(VteTerminal *terminal,
-                                       const GdkRGBA *background) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2);
+                                       const GdkRGBA *background) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 void vte_terminal_set_color_cursor(VteTerminal *terminal,
-                                   const GdkRGBA *cursor_background) VTE_GNUC_NONNULL(1);
+                                   const GdkRGBA *cursor_background) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_color_highlight(VteTerminal *terminal,
-                                      const GdkRGBA *highlight_background) VTE_GNUC_NONNULL(1);
+                                      const GdkRGBA *highlight_background) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_color_highlight_foreground(VteTerminal *terminal,
-                                                 const GdkRGBA *highlight_foreground) VTE_GNUC_NONNULL(1);
+                                                 const GdkRGBA *highlight_foreground) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_colors(VteTerminal *terminal,
                              const GdkRGBA *foreground,
                              const GdkRGBA *background,
                              const GdkRGBA *palette,
-                             gsize palette_size) VTE_GNUC_NONNULL(1);
+                             gsize palette_size) _VTE_GNUC_NONNULL(1);
 
-void vte_terminal_set_default_colors(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+void vte_terminal_set_default_colors(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set whether or not the cursor blinks. */
 void vte_terminal_set_cursor_blink_mode(VteTerminal *terminal,
-                                       VteCursorBlinkMode mode) VTE_GNUC_NONNULL(1);
-VteCursorBlinkMode vte_terminal_get_cursor_blink_mode(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                       VteCursorBlinkMode mode) _VTE_GNUC_NONNULL(1);
+VteCursorBlinkMode vte_terminal_get_cursor_blink_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set cursor shape */
 void vte_terminal_set_cursor_shape(VteTerminal *terminal,
-                                  VteCursorShape shape) VTE_GNUC_NONNULL(1);
-VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                  VteCursorShape shape) _VTE_GNUC_NONNULL(1);
+VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set the number of scrollback lines, above or at an internal minimum. */
 void vte_terminal_set_scrollback_lines(VteTerminal *terminal,
-                                       glong lines) VTE_GNUC_NONNULL(1);
+                                       glong lines) _VTE_GNUC_NONNULL(1);
 
 /* Set or retrieve the current font. */
 void vte_terminal_set_font(VteTerminal *terminal,
-                          const PangoFontDescription *font_desc) VTE_GNUC_NONNULL(1);
-const PangoFontDescription *vte_terminal_get_font(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                          const PangoFontDescription *font_desc) _VTE_GNUC_NONNULL(1);
+const PangoFontDescription *vte_terminal_get_font(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_allow_bold(VteTerminal *terminal,
-                                 gboolean allow_bold) VTE_GNUC_NONNULL(1);
-gboolean vte_terminal_get_allow_bold(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                 gboolean allow_bold) _VTE_GNUC_NONNULL(1);
+gboolean vte_terminal_get_allow_bold(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Check if the terminal is the current selection owner. */
-gboolean vte_terminal_get_has_selection(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+gboolean vte_terminal_get_has_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set what happens when the user strikes backspace or delete. */
 void vte_terminal_set_backspace_binding(VteTerminal *terminal,
-                                       VteEraseBinding binding) VTE_GNUC_NONNULL(1);
+                                       VteEraseBinding binding) _VTE_GNUC_NONNULL(1);
 void vte_terminal_set_delete_binding(VteTerminal *terminal,
-                                    VteEraseBinding binding) VTE_GNUC_NONNULL(1);
+                                    VteEraseBinding binding) _VTE_GNUC_NONNULL(1);
 
 /* Manipulate the autohide setting. */
 void vte_terminal_set_mouse_autohide(VteTerminal *terminal,
-                                     gboolean setting) VTE_GNUC_NONNULL(1);
-gboolean vte_terminal_get_mouse_autohide(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                     gboolean setting) _VTE_GNUC_NONNULL(1);
+gboolean vte_terminal_get_mouse_autohide(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Reset the terminal, optionally clearing the tab stops and line history. */
 void vte_terminal_reset(VteTerminal *terminal,
                         gboolean clear_tabstops,
-                       gboolean clear_history) VTE_GNUC_NONNULL(1);
+                       gboolean clear_history) _VTE_GNUC_NONNULL(1);
 
 /* Read the contents of the terminal, using a callback function to determine
  * if a particular location on the screen (0-based) is interesting enough to
@@ -269,112 +269,112 @@ void vte_terminal_reset(VteTerminal *terminal,
 char *vte_terminal_get_text(VteTerminal *terminal,
                            VteSelectionFunc is_selected,
                            gpointer user_data,
-                           GArray *attributes) VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
+                           GArray *attributes) _VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
 char *vte_terminal_get_text_include_trailing_spaces(VteTerminal *terminal,
                                                    VteSelectionFunc is_selected,
                                                    gpointer user_data,
-                                                   GArray *attributes) VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
+                                                   GArray *attributes) _VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
 char *vte_terminal_get_text_range(VteTerminal *terminal,
                                  glong start_row, glong start_col,
                                  glong end_row, glong end_col,
                                  VteSelectionFunc is_selected,
                                  gpointer user_data,
-                                 GArray *attributes) VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
+                                 GArray *attributes) _VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
 void vte_terminal_get_cursor_position(VteTerminal *terminal,
                                      glong *column,
-                                      glong *row) VTE_GNUC_NONNULL(1);
+                                      glong *row) _VTE_GNUC_NONNULL(1);
 
 /* Add a matching expression, returning the tag the widget assigns to that
  * expression. */
 int vte_terminal_match_add_gregex(VteTerminal *terminal,
                                   GRegex *regex,
-                                  GRegexMatchFlags flags) VTE_GNUC_NONNULL(1);
+                                  GRegexMatchFlags flags) _VTE_GNUC_NONNULL(1);
 /* Set the cursor to be used when the pointer is over a given match. */
 void vte_terminal_match_set_cursor(VteTerminal *terminal,
                                    int tag,
-                                  GdkCursor *cursor) VTE_GNUC_NONNULL(1);
+                                  GdkCursor *cursor) _VTE_GNUC_NONNULL(1);
 void vte_terminal_match_set_cursor_type(VteTerminal *terminal,
                                        int tag,
-                                        GdkCursorType cursor_type) VTE_GNUC_NONNULL(1);
+                                        GdkCursorType cursor_type) _VTE_GNUC_NONNULL(1);
 void vte_terminal_match_set_cursor_name(VteTerminal *terminal,
                                        int tag,
-                                        const char *cursor_name) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(3);
+                                        const char *cursor_name) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(3);
 void vte_terminal_match_remove(VteTerminal *terminal,
-                               int tag) VTE_GNUC_NONNULL(1);
-void vte_terminal_match_remove_all(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                               int tag) _VTE_GNUC_NONNULL(1);
+void vte_terminal_match_remove_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Check if a given cell on the screen contains part of a matched string.  If
  * it does, return the string, and store the match tag in the optional tag
  * argument. */
 char *vte_terminal_match_check(VteTerminal *terminal,
                               glong column, glong row,
-                              int *tag) VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
+                              int *tag) _VTE_GNUC_NONNULL(1) G_GNUC_MALLOC;
 char *vte_terminal_match_check_event(VteTerminal *terminal,
                                      GdkEvent *event,
-                                     int *tag) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2) G_GNUC_MALLOC;
+                                     int *tag) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2) G_GNUC_MALLOC;
 
 void      vte_terminal_search_set_gregex      (VteTerminal *terminal,
                                               GRegex      *regex,
-                                               GRegexMatchFlags flags) VTE_GNUC_NONNULL(1);
-GRegex   *vte_terminal_search_get_gregex      (VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                               GRegexMatchFlags flags) _VTE_GNUC_NONNULL(1);
+GRegex   *vte_terminal_search_get_gregex      (VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 void      vte_terminal_search_set_wrap_around (VteTerminal *terminal,
-                                              gboolean     wrap_around) VTE_GNUC_NONNULL(1);
-gboolean  vte_terminal_search_get_wrap_around (VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-gboolean  vte_terminal_search_find_previous   (VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-gboolean  vte_terminal_search_find_next       (VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                              gboolean     wrap_around) _VTE_GNUC_NONNULL(1);
+gboolean  vte_terminal_search_get_wrap_around (VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+gboolean  vte_terminal_search_find_previous   (VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+gboolean  vte_terminal_search_find_next       (VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 
 /* Set the emulation type.  Most of the time you won't need this. */
 void vte_terminal_set_emulation(VteTerminal *terminal,
-                                const char *emulation) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_emulation(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                const char *emulation) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_emulation(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set the character encoding.  Most of the time you won't need this. */
 void vte_terminal_set_encoding(VteTerminal *terminal,
-                               const char *codeset) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_encoding(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                               const char *codeset) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_encoding(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* CJK compatibility setting */
 void vte_terminal_set_cjk_ambiguous_width(VteTerminal *terminal,
-                                          int width) VTE_GNUC_NONNULL(1);
-int vte_terminal_get_cjk_ambiguous_width(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                          int width) _VTE_GNUC_NONNULL(1);
+int vte_terminal_get_cjk_ambiguous_width(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Get the contents of the status line. */
-const char *vte_terminal_get_status_line(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_status_line(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 void vte_terminal_set_pty(VteTerminal *terminal,
-                          VtePty *pty) VTE_GNUC_NONNULL(1);
-VtePty *vte_terminal_get_pty(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                          VtePty *pty) _VTE_GNUC_NONNULL(1);
+VtePty *vte_terminal_get_pty(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Accessors for bindings. */
-glong vte_terminal_get_char_width(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-glong vte_terminal_get_char_height(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-glong vte_terminal_get_row_count(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-glong vte_terminal_get_column_count(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_window_title(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_icon_title(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_current_directory_uri(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
-const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+glong vte_terminal_get_char_width(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+glong vte_terminal_get_char_height(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+glong vte_terminal_get_row_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+glong vte_terminal_get_column_count(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_window_title(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_icon_title(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_current_directory_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+const char *vte_terminal_get_current_file_uri(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* misc */
 void vte_terminal_set_input_enabled (VteTerminal *terminal,
-                                     gboolean enabled) VTE_GNUC_NONNULL(1);
-gboolean vte_terminal_get_input_enabled (VteTerminal *terminal) VTE_GNUC_NONNULL(1);
+                                     gboolean enabled) _VTE_GNUC_NONNULL(1);
+gboolean vte_terminal_get_input_enabled (VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Window geometry helpers */
 void vte_terminal_get_geometry_hints(VteTerminal *terminal,
                                      GdkGeometry *hints,
                                      int min_rows,
-                                     int min_columns) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2);
+                                     int min_columns) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 void vte_terminal_set_geometry_hints_for_window(VteTerminal *terminal,
-                                                GtkWindow *window) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2);
+                                                GtkWindow *window) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 
 /* Writing contents out */
 gboolean vte_terminal_write_contents (VteTerminal *terminal,
                                      GOutputStream *stream,
                                      VteWriteFlags flags,
                                      GCancellable *cancellable,
-                                     GError **error) VTE_GNUC_NONNULL(1) VTE_GNUC_NONNULL(2);
+                                     GError **error) _VTE_GNUC_NONNULL(1) _VTE_GNUC_NONNULL(2);
 
 G_END_DECLS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]