[vte] widget: Improve API name



commit e6131f4a7aea14faa85f7f1b915ad3c59f26f806
Author: Christian Persch <chpe gnome org>
Date:   Sun Aug 17 20:00:59 2014 +0200

    widget: Improve API name
    
    Synchronous functions should be named ..._sync.

 doc/reference/vte-sections.txt |    2 +-
 src/app.vala                   |    2 +-
 src/vte.c                      |   14 ++++++--------
 src/vteapp.c                   |    6 +++---
 src/vteterminal.h              |   10 +++++-----
 5 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/doc/reference/vte-sections.txt b/doc/reference/vte-sections.txt
index 48bdfa8..0f8e39c 100644
--- a/doc/reference/vte-sections.txt
+++ b/doc/reference/vte-sections.txt
@@ -68,7 +68,7 @@ vte_terminal_set_cjk_ambiguous_width
 vte_terminal_get_cjk_ambiguous_width
 vte_terminal_set_encoding
 vte_terminal_get_encoding
-vte_terminal_write_contents
+vte_terminal_write_contents_sync
 vte_terminal_search_find_next
 vte_terminal_search_find_previous
 vte_terminal_search_get_gregex
diff --git a/src/app.vala b/src/app.vala
index 77ea78c..8922af0 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -395,7 +395,7 @@ class Window : Gtk.ApplicationWindow
       try {
         var file = GLib.File.new_for_commandline_arg(App.Options.output_filename);
         var stream = file.replace(null, false, GLib.FileCreateFlags.NONE, null);
-        terminal.write_contents(stream, Vte.WriteFlags.DEFAULT, null);
+        terminal.write_contents_sync(stream, Vte.WriteFlags.DEFAULT, null);
       } catch (Error e) {
         printerr("Failed to write output to \"%s\": %s\n",
                  App.Options.output_filename, e.message);
diff --git a/src/vte.c b/src/vte.c
index 67b4ba7..53305ef 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -13381,7 +13381,7 @@ update_timeout (gpointer data)
 }
 
 /**
- * vte_terminal_write_contents:
+ * vte_terminal_write_contents_sync:
  * @terminal: a #VteTerminal
  * @stream: a #GOutputStream to write to
  * @flags: a set of #VteWriteFlags
@@ -13400,15 +13400,13 @@ update_timeout (gpointer data)
  * depending on scrollback history and @stream availability for writing.
  *
  * Returns: %TRUE on success, %FALSE if there was an error
- *
- * Since: 0.24
  */
 gboolean
-vte_terminal_write_contents (VteTerminal *terminal,
-                             GOutputStream *stream,
-                             VteWriteFlags flags,
-                             GCancellable *cancellable,
-                             GError **error)
+vte_terminal_write_contents_sync (VteTerminal *terminal,
+                                  GOutputStream *stream,
+                                  VteWriteFlags flags,
+                                  GCancellable *cancellable,
+                                  GError **error)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
         g_return_val_if_fail(G_IS_OUTPUT_STREAM(stream), FALSE);
diff --git a/src/vteapp.c b/src/vteapp.c
index 31536a9..d598a61 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -105,9 +105,9 @@ destroy_and_quit(VteTerminal *terminal, GtkWidget *window)
                stream = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, 
&error));
 
                if (stream) {
-                       vte_terminal_write_contents (terminal, stream,
-                                                    VTE_WRITE_DEFAULT,
-                                                    NULL, &error);
+                       vte_terminal_write_contents_sync (terminal, stream,
+                                                          VTE_WRITE_DEFAULT,
+                                                          NULL, &error);
                        g_object_unref (stream);
                }
 
diff --git a/src/vteterminal.h b/src/vteterminal.h
index 1e9fe90..8ec803c 100644
--- a/src/vteterminal.h
+++ b/src/vteterminal.h
@@ -361,11 +361,11 @@ void vte_terminal_set_geometry_hints_for_window(VteTerminal *terminal,
                                                 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);
+gboolean vte_terminal_write_contents_sync (VteTerminal *terminal,
+                                           GOutputStream *stream,
+                                           VteWriteFlags flags,
+                                           GCancellable *cancellable,
+                                           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]