GNOME.org
 

[vte] all: Rename API

commit 8d7f0d7f0ee36698d7de3db7aba737e342a27766
Author: Christian Persch <chpe gnome org>
Date:   Mon Apr 7 09:40:53 2014 +0200

    all: Rename API

 doc/reference/vte-sections.txt |   24 ++++++++++++------------
 doc/reference/vte.types        |    8 ++++----
 src/ring.c                     |    6 +++---
 src/ring.h                     |    2 +-
 src/vte-private.h              |    6 +++---
 src/vte.c                      |   32 ++++++++++++++++----------------
 src/vte.h                      |   34 +++++++++++++++++-----------------
 src/vteapp.c                   |   10 +++++-----
 8 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index 30dc566..99c4d02 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -2,10 +2,10 @@
 <FILE>vte-terminal</FILE>
 <TITLE>VteTerminal</TITLE>
 VteTerminal
-VteTerminalCursorBlinkMode
-VteTerminalCursorShape
-VteTerminalEraseBinding
-VteTerminalWriteFlags
+VteCursorBlinkMode
+VteCursorShape
+VteEraseBinding
+VteWriteFlags
 VteSelectionFunc
 vte_terminal_new
 vte_terminal_feed
@@ -90,14 +90,14 @@ vte_terminal_pty_new_sync
 vte_terminal_watch_child
 
 <SUBSECTION Standard>
-VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE
-vte_terminal_cursor_blink_mode_get_type
-VTE_TYPE_TERMINAL_CURSOR_SHAPE
-vte_terminal_cursor_shape_get_type
-VTE_TYPE_TERMINAL_ERASE_BINDING
-vte_terminal_erase_binding_get_type
-VTE_TYPE_TERMINAL_WRITE_FLAGS
-vte_terminal_write_flags_get_type
+VTE_TYPE_CURSOR_BLINK_MODE
+vte_cursor_blink_mode_get_type
+VTE_TYPE_CURSOR_SHAPE
+vte_cursor_shape_get_type
+VTE_TYPE_ERASE_BINDING
+vte_erase_binding_get_type
+VTE_TYPE_WRITE_FLAGS
+vte_write_flags_get_type
 VTE_TYPE_TERMINAL
 vte_terminal_get_type
 VTE_IS_TERMINAL
diff --git a/doc/reference/vte.types b/doc/reference/vte.types
index b7c73a0..c508837 100644
--- a/doc/reference/vte.types
+++ b/doc/reference/vte.types
@@ -12,7 +12,7 @@ vte_terminal_get_type
 
 vte_pty_error_get_type
 vte_pty_flags_get_type
-vte_terminal_cursor_blink_mode_get_type
-vte_terminal_cursor_shape_get_type
-vte_terminal_erase_binding_get_type
-vte_terminal_write_flags_get_type
+vte_cursor_blink_mode_get_type
+vte_cursor_shape_get_type
+vte_erase_binding_get_type
+vte_write_flags_get_type
diff --git a/src/ring.c b/src/ring.c
index 03720ac..267be8b 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -1017,7 +1017,7 @@ static gboolean
 _vte_ring_write_row (VteRing *ring,
                     GOutputStream *stream,
                     VteRowData *row,
-                    VteTerminalWriteFlags flags,
+                    VteWriteFlags flags,
                     GCancellable *cancellable,
                     GError **error)
 {
@@ -1043,7 +1043,7 @@ _vte_ring_write_row (VteRing *ring,
  * _vte_ring_write_contents:
  * @ring: a #VteRing
  * @stream: a #GOutputStream to write to
- * @flags: a set of #VteTerminalWriteFlags
+ * @flags: a set of #VteWriteFlags
  * @cancellable: optional #GCancellable object, %NULL to ignore
  * @error: a #GError location to store the error occuring, or %NULL to ignore
  *
@@ -1054,7 +1054,7 @@ _vte_ring_write_row (VteRing *ring,
 gboolean
 _vte_ring_write_contents (VteRing *ring,
                          GOutputStream *stream,
-                         VteTerminalWriteFlags flags,
+                         VteWriteFlags flags,
                          GCancellable *cancellable,
                          GError **error)
 {
diff --git a/src/ring.h b/src/ring.h
index d5a1781..ec38019 100644
--- a/src/ring.h
+++ b/src/ring.h
@@ -89,7 +89,7 @@ void _vte_ring_set_visible_rows_hint (VteRing *ring, gulong rows);
 void _vte_ring_rewrap (VteRing *ring, glong columns, VteVisualPosition **markers);
 gboolean _vte_ring_write_contents (VteRing *ring,
                                   GOutputStream *stream,
-                                  VteTerminalWriteFlags flags,
+                                  VteWriteFlags flags,
                                   GCancellable *cancellable,
                                   GError **error);
 
diff --git a/src/vte-private.h b/src/vte-private.h
index df64681..84e50a5 100644
--- a/src/vte-private.h
+++ b/src/vte-private.h
@@ -288,7 +288,7 @@ struct _VteTerminalPrivate {
        VteVisualPosition selection_start, selection_end;
 
        /* Miscellaneous options. */
-       VteTerminalEraseBinding backspace_binding, delete_binding;
+       VteEraseBinding backspace_binding, delete_binding;
        gboolean meta_sends_escape;
        gboolean audible_bell;
        gboolean visible_bell;
@@ -311,11 +311,11 @@ struct _VteTerminalPrivate {
        long scrollback_lines;
 
        /* Cursor shape */
-       VteTerminalCursorShape cursor_shape;
+       VteCursorShape cursor_shape;
         float cursor_aspect_ratio;
 
        /* Cursor blinking. */
-        VteTerminalCursorBlinkMode cursor_blink_mode;
+        VteCursorBlinkMode cursor_blink_mode;
        gboolean cursor_blink_state;
        guint cursor_blink_tag;           /* cursor blinking timeout ID */
         gint cursor_blink_cycle;          /* gtk-cursor-blink-time / 2 */
diff --git a/src/vte.c b/src/vte.c
index 48357c0..fd490f2 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -11583,7 +11583,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
                 (gobject_class,
                  PROP_BACKSPACE_BINDING,
                  g_param_spec_enum ("backspace-binding", NULL, NULL,
-                                    VTE_TYPE_TERMINAL_ERASE_BINDING,
+                                    VTE_TYPE_ERASE_BINDING,
                                     VTE_ERASE_AUTO,
                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -11618,7 +11618,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
                 (gobject_class,
                  PROP_CURSOR_BLINK_MODE,
                  g_param_spec_enum ("cursor-blink-mode", NULL, NULL,
-                                    VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE,
+                                    VTE_TYPE_CURSOR_BLINK_MODE,
                                     VTE_CURSOR_BLINK_SYSTEM,
                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -11633,7 +11633,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
                 (gobject_class,
                  PROP_CURSOR_SHAPE,
                  g_param_spec_enum ("cursor-shape", NULL, NULL,
-                                    VTE_TYPE_TERMINAL_CURSOR_SHAPE,
+                                    VTE_TYPE_CURSOR_SHAPE,
                                     VTE_CURSOR_SHAPE_BLOCK,
                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
      
@@ -11649,7 +11649,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
                 (gobject_class,
                  PROP_DELETE_BINDING,
                  g_param_spec_enum ("delete-binding", NULL, NULL,
-                                    VTE_TYPE_TERMINAL_ERASE_BINDING,
+                                    VTE_TYPE_ERASE_BINDING,
                                     VTE_ERASE_AUTO,
                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
      
@@ -12283,7 +12283,7 @@ vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink)
 /**
  * vte_terminal_set_cursor_blink_mode:
  * @terminal: a #VteTerminal
- * @mode: the #VteTerminalCursorBlinkMode to use
+ * @mode: the #VteCursorBlinkMode to use
  *
  * Sets whether or not the cursor will blink. Using %VTE_CURSOR_BLINK_SYSTEM
  * will use the #GtkSettings::gtk-cursor-blink setting.
@@ -12291,7 +12291,7 @@ vte_terminal_set_cursor_blinks_internal(VteTerminal *terminal, gboolean blink)
  * Since: 0.17.1
  */
 void
-vte_terminal_set_cursor_blink_mode(VteTerminal *terminal, VteTerminalCursorBlinkMode mode)
+vte_terminal_set_cursor_blink_mode(VteTerminal *terminal, VteCursorBlinkMode mode)
 {
         VteTerminalPrivate *pvt;
         gboolean blinks;
@@ -12333,7 +12333,7 @@ vte_terminal_set_cursor_blink_mode(VteTerminal *terminal, VteTerminalCursorBlink
  *
  * Since: 0.17.1
  */
-VteTerminalCursorBlinkMode
+VteCursorBlinkMode
 vte_terminal_get_cursor_blink_mode(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), VTE_CURSOR_BLINK_SYSTEM);
@@ -12344,14 +12344,14 @@ vte_terminal_get_cursor_blink_mode(VteTerminal *terminal)
 /**
  * vte_terminal_set_cursor_shape:
  * @terminal: a #VteTerminal
- * @shape: the #VteTerminalCursorShape to use
+ * @shape: the #VteCursorShape to use
  *
  * Sets the shape of the cursor drawn.
  *
  * Since: 0.20
  */
 void
-vte_terminal_set_cursor_shape(VteTerminal *terminal, VteTerminalCursorShape shape)
+vte_terminal_set_cursor_shape(VteTerminal *terminal, VteCursorShape shape)
 {
         VteTerminalPrivate *pvt;
 
@@ -12377,7 +12377,7 @@ vte_terminal_set_cursor_shape(VteTerminal *terminal, VteTerminalCursorShape shap
  *
  * Since: 0.17.6
  */
-VteTerminalCursorShape
+VteCursorShape
 vte_terminal_get_cursor_shape(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), VTE_CURSOR_SHAPE_BLOCK);
@@ -12563,7 +12563,7 @@ vte_terminal_set_word_chars(VteTerminal *terminal, const char *spec)
 /**
  * vte_terminal_set_backspace_binding:
  * @terminal: a #VteTerminal
- * @binding: a #VteTerminalEraseBinding for the backspace key
+ * @binding: a #VteEraseBinding for the backspace key
  *
  * Modifies the terminal's backspace key binding, which controls what
  * string or control sequence the terminal sends to its child when the user
@@ -12571,7 +12571,7 @@ vte_terminal_set_word_chars(VteTerminal *terminal, const char *spec)
  */
 void
 vte_terminal_set_backspace_binding(VteTerminal *terminal,
-                                  VteTerminalEraseBinding binding)
+                                  VteEraseBinding binding)
 {
         VteTerminalPrivate *pvt;
 
@@ -12591,7 +12591,7 @@ vte_terminal_set_backspace_binding(VteTerminal *terminal,
 /**
  * vte_terminal_set_delete_binding:
  * @terminal: a #VteTerminal
- * @binding: a #VteTerminalEraseBinding for the delete key
+ * @binding: a #VteEraseBinding for the delete key
  *
  * Modifies the terminal's delete key binding, which controls what
  * string or control sequence the terminal sends to its child when the user
@@ -12599,7 +12599,7 @@ vte_terminal_set_backspace_binding(VteTerminal *terminal,
  */
 void
 vte_terminal_set_delete_binding(VteTerminal *terminal,
-                               VteTerminalEraseBinding binding)
+                               VteEraseBinding binding)
 {
         VteTerminalPrivate *pvt;
 
@@ -13705,7 +13705,7 @@ update_timeout (gpointer data)
  * vte_terminal_write_contents:
  * @terminal: a #VteTerminal
  * @stream: a #GOutputStream to write to
- * @flags: a set of #VteTerminalWriteFlags
+ * @flags: a set of #VteWriteFlags
  * @cancellable: (allow-none): a #GCancellable object, or %NULL
  * @error: (allow-none): a #GError location to store the error occuring, or %NULL
  *
@@ -13727,7 +13727,7 @@ update_timeout (gpointer data)
 gboolean
 vte_terminal_write_contents (VteTerminal *terminal,
                              GOutputStream *stream,
-                             VteTerminalWriteFlags flags,
+                             VteWriteFlags flags,
                              GCancellable *cancellable,
                              GError **error)
 {
diff --git a/src/vte.h b/src/vte.h
index 01c3b80..55662b0 100644
--- a/src/vte.h
+++ b/src/vte.h
@@ -113,7 +113,7 @@ struct _VteTerminalClass {
 };
 
 /**
- * VteTerminalEraseBinding:
+ * VteEraseBinding:
  * @VTE_ERASE_AUTO: For backspace, attempt to determine the right value from the terminal's IO settings.  
For delete, use the control sequence.
  * @VTE_ERASE_ASCII_BACKSPACE: Send an ASCII backspace character (0x08).
  * @VTE_ERASE_ASCII_DELETE: Send an ASCII delete character (0x7F).
@@ -130,10 +130,10 @@ typedef enum {
        VTE_ERASE_ASCII_DELETE,
        VTE_ERASE_DELETE_SEQUENCE,
        VTE_ERASE_TTY
-} VteTerminalEraseBinding;
+} VteEraseBinding;
 
 /**
- * VteTerminalCursorBlinkMode:
+ * VteCursorBlinkMode:
  * @VTE_CURSOR_BLINK_SYSTEM: Follow GTK+ settings for cursor blinking.
  * @VTE_CURSOR_BLINK_ON: Cursor blinks.
  * @VTE_CURSOR_BLINK_OFF: Cursor does not blink.
@@ -145,10 +145,10 @@ typedef enum {
         VTE_CURSOR_BLINK_SYSTEM,
         VTE_CURSOR_BLINK_ON,
         VTE_CURSOR_BLINK_OFF
-} VteTerminalCursorBlinkMode;
+} VteCursorBlinkMode;
 
 /**
- * VteTerminalCursorShape:
+ * VteCursorShape:
  * @VTE_CURSOR_SHAPE_BLOCK: Draw a block cursor.  This is the default.
  * @VTE_CURSOR_SHAPE_IBEAM: Draw a vertical bar on the left side of character.
  * This is similar to the default cursor for other GTK+ widgets.
@@ -161,7 +161,7 @@ typedef enum {
         VTE_CURSOR_SHAPE_BLOCK,
         VTE_CURSOR_SHAPE_IBEAM,
         VTE_CURSOR_SHAPE_UNDERLINE
-} VteTerminalCursorShape;
+} VteCursorShape;
 
 /* The structure we return as the supplemental attributes for strings. */
 typedef struct _VteCharAttributes VteCharAttributes;
@@ -262,13 +262,13 @@ void vte_terminal_set_default_colors(VteTerminal *terminal);
 
 /* Set whether or not the cursor blinks. */
 void vte_terminal_set_cursor_blink_mode(VteTerminal *terminal,
-                                       VteTerminalCursorBlinkMode mode);
-VteTerminalCursorBlinkMode vte_terminal_get_cursor_blink_mode(VteTerminal *terminal);
+                                       VteCursorBlinkMode mode);
+VteCursorBlinkMode vte_terminal_get_cursor_blink_mode(VteTerminal *terminal);
 
 /* Set cursor shape */
 void vte_terminal_set_cursor_shape(VteTerminal *terminal,
-                                  VteTerminalCursorShape shape);
-VteTerminalCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal);
+                                  VteCursorShape shape);
+VteCursorShape vte_terminal_get_cursor_shape(VteTerminal *terminal);
 
 /* Set the number of scrollback lines, above or at an internal minimum. */
 void vte_terminal_set_scrollback_lines(VteTerminal *terminal, glong lines);
@@ -285,9 +285,9 @@ gboolean vte_terminal_get_has_selection(VteTerminal *terminal);
 
 /* Set what happens when the user strikes backspace or delete. */
 void vte_terminal_set_backspace_binding(VteTerminal *terminal,
-                                       VteTerminalEraseBinding binding);
+                                       VteEraseBinding binding);
 void vte_terminal_set_delete_binding(VteTerminal *terminal,
-                                    VteTerminalEraseBinding binding);
+                                    VteEraseBinding binding);
 
 /* Manipulate the autohide setting. */
 void vte_terminal_set_mouse_autohide(VteTerminal *terminal, gboolean setting);
@@ -387,19 +387,19 @@ const char *vte_terminal_get_current_file_uri(VteTerminal *terminal);
 /* Writing contents out */
 
 /**
- * VteTerminalWriteFlags:
- * @VTE_TERMINAL_WRITE_DEFAULT: Write contents as UTF-8 text.  This is the default.
+ * VteWriteFlags:
+ * @VTE_WRITE_DEFAULT: Write contents as UTF-8 text.  This is the default.
  *
  * A flag type to determine how terminal contents should be written
  * to an output stream.
  */
 typedef enum {
-  VTE_TERMINAL_WRITE_DEFAULT = 0
-} VteTerminalWriteFlags;
+  VTE_WRITE_DEFAULT = 0
+} VteWriteFlags;
 
 gboolean vte_terminal_write_contents (VteTerminal *terminal,
                                      GOutputStream *stream,
-                                     VteTerminalWriteFlags flags,
+                                     VteWriteFlags flags,
                                      GCancellable *cancellable,
                                      GError **error);
 
diff --git a/src/vteapp.c b/src/vteapp.c
index d30e3a2..78ba9bd 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -147,7 +147,7 @@ destroy_and_quit(VteTerminal *terminal, GtkWidget *window)
 
                if (stream) {
                        vte_terminal_write_contents (terminal, stream,
-                                                    VTE_TERMINAL_WRITE_DEFAULT,
+                                                    VTE_WRITE_DEFAULT,
                                                     NULL, &error);
                        g_object_unref (stream);
                }
@@ -807,8 +807,8 @@ main(int argc, char **argv)
        };
        GOptionContext *context;
        GError *error = NULL;
-       VteTerminalCursorBlinkMode cursor_blink_mode = VTE_CURSOR_BLINK_SYSTEM;
-       VteTerminalCursorShape cursor_shape = VTE_CURSOR_SHAPE_BLOCK;
+       VteCursorBlinkMode cursor_blink_mode = VTE_CURSOR_BLINK_SYSTEM;
+       VteCursorShape cursor_shape = VTE_CURSOR_SHAPE_BLOCK;
        GtkPolicyType scrollbar_policy = GTK_POLICY_ALWAYS;
        VtePtyFlags pty_flags = VTE_PTY_DEFAULT;
 
@@ -837,11 +837,11 @@ main(int argc, char **argv)
        }
 
        if (cursor_blink_mode_string) {
-               cursor_blink_mode = parse_enum(VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE, cursor_blink_mode_string);
+               cursor_blink_mode = parse_enum(VTE_TYPE_CURSOR_BLINK_MODE, cursor_blink_mode_string);
                g_free(cursor_blink_mode_string);
        }
        if (cursor_shape_string) {
-               cursor_shape = parse_enum(VTE_TYPE_TERMINAL_CURSOR_SHAPE, cursor_shape_string);
+               cursor_shape = parse_enum(VTE_TYPE_CURSOR_SHAPE, cursor_shape_string);
                g_free(cursor_shape_string);
        }
        if (scrollbar_policy_string) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]