[gnome-terminal] screen: Update for vte API



commit ef5b45cad7d4fb6ce1a22d2f9fed00c97f9e85d7
Author: Christian Persch <chpe gnome org>
Date:   Mon Mar 24 21:02:28 2014 +0100

    screen: Update for vte API
    
    Corresponding to vte commit 8d7f0d7f0ee36698d7de3db7aba737e342a27766.

 src/migration.c       |    4 ++--
 src/profile-editor.c  |    6 +++---
 src/terminal-window.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/migration.c b/src/migration.c
index 2011ac0..7a7a773 100644
--- a/src/migration.c
+++ b/src/migration.c
@@ -442,10 +442,10 @@ migrate_profile (TerminalSettingsList *list,
                   settings, TERMINAL_PROFILE_CUSTOM_COMMAND_KEY);
   migrate_genum (client, path, KEY_CURSOR_BLINK_MODE,
                  settings, TERMINAL_PROFILE_CURSOR_BLINK_MODE_KEY,
-                 VTE_TYPE_TERMINAL_CURSOR_BLINK_MODE);
+                 VTE_TYPE_CURSOR_BLINK_MODE);
   migrate_genum (client, path, KEY_CURSOR_SHAPE,
                  settings, TERMINAL_PROFILE_CURSOR_SHAPE_KEY,
-                 VTE_TYPE_TERMINAL_CURSOR_SHAPE);
+                 VTE_TYPE_CURSOR_SHAPE);
   migrate_palette (client, path, settings);
   migrate_string (client, path, KEY_FONT,
                   settings, TERMINAL_PROFILE_FONT_KEY);
diff --git a/src/profile-editor.c b/src/profile-editor.c
index ceef4e6..4bc1f7f 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -898,7 +898,7 @@ terminal_profile_edit (GSettings  *profile,
                                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET,
                                 (GSettingsBindGetMapping) string_to_enum,
                                 (GSettingsBindSetMapping) enum_to_string,
-                                vte_terminal_erase_binding_get_type, NULL);
+                                vte_erase_binding_get_type, NULL);
   g_settings_bind (profile, TERMINAL_PROFILE_BOLD_COLOR_SAME_AS_FG_KEY,
                    gtk_builder_get_object (builder,
                                            "bold-color-same-as-fg-checkbox"),
@@ -925,7 +925,7 @@ terminal_profile_edit (GSettings  *profile,
                                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET,
                                 (GSettingsBindGetMapping) string_to_enum,
                                 (GSettingsBindSetMapping) enum_to_string,
-                                vte_terminal_cursor_shape_get_type, NULL);
+                                vte_cursor_shape_get_type, NULL);
   g_settings_bind (profile, TERMINAL_PROFILE_CUSTOM_COMMAND_KEY,
                    gtk_builder_get_object (builder, "custom-command-entry"),
                    "text", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
@@ -948,7 +948,7 @@ terminal_profile_edit (GSettings  *profile,
                                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET,
                                 (GSettingsBindGetMapping) string_to_enum,
                                 (GSettingsBindSetMapping) enum_to_string,
-                                vte_terminal_erase_binding_get_type, NULL);
+                                vte_erase_binding_get_type, NULL);
   g_settings_bind_with_mapping (profile, TERMINAL_PROFILE_EXIT_ACTION_KEY,
                                 gtk_builder_get_object (builder,
                                                         "exit-action-combobox"),
diff --git a/src/terminal-window.c b/src/terminal-window.c
index e87b98e..f41c826 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -485,7 +485,7 @@ save_contents_dialog_on_response (GtkDialog *dialog, gint response_id, gpointer
        * Should be replaced with the async version when vte implements that.
        */
       vte_terminal_write_contents (terminal, stream,
-                                  VTE_TERMINAL_WRITE_DEFAULT,
+                                  VTE_WRITE_DEFAULT,
                                   NULL, &error);
       g_object_unref (stream);
     }


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