GNOME.org
 

[gnome-terminal] profile: prefs: Remove update-records pref

commit d3aa520b96dd0e4ceb66b45a517df9d23ad10845
Author: Christian Persch <chpe gnome org>
Date:   Tue Mar 31 19:02:39 2015 +0200

    profile: prefs: Remove update-records pref
    
    With gnome-pty-helper gone, it's a no-op.

 src/migration.c                    |    4 ----
 src/org.gnome.Terminal.gschema.xml |    5 -----
 src/profile-editor.c               |    4 ----
 src/profile-preferences.ui         |   20 +++-----------------
 src/terminal-schemas.h             |    1 -
 src/terminal-screen.c              |    5 -----
 6 files changed, 3 insertions(+), 36 deletions(-)
---
diff --git a/src/migration.c b/src/migration.c
index 6cdd573..0709200 100644
--- a/src/migration.c
+++ b/src/migration.c
@@ -86,7 +86,6 @@ enum {
 #define KEY_SCROLL_ON_KEYSTROKE "scroll_on_keystroke"
 #define KEY_SCROLL_ON_OUTPUT "scroll_on_output"
 #define KEY_SILENT_BELL "silent_bell"
-#define KEY_UPDATE_RECORDS "update_records"
 #define KEY_USE_CUSTOM_COMMAND "use_custom_command"
 #define KEY_USE_SYSTEM_FONT "use_system_font"
 #define KEY_USE_THEME_COLORS "use_theme_colors"
@@ -425,9 +424,6 @@ migrate_profile (TerminalSettingsList *list,
   migrate_bool (client, path, KEY_LOGIN_SHELL,
                 settings, TERMINAL_PROFILE_LOGIN_SHELL_KEY,
                 FALSE);
-  migrate_bool (client, path, KEY_UPDATE_RECORDS,
-                settings, TERMINAL_PROFILE_UPDATE_RECORDS_KEY,
-                FALSE);
   migrate_bool (client, path, KEY_USE_CUSTOM_COMMAND,
                 settings, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY,
                 FALSE);
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 0f8433f..986caed 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -189,11 +189,6 @@
       <summary>Whether to launch the command in the terminal as a login shell</summary>
       <description>If true, the command inside the terminal will be launched as a login shell (argv[0] will 
have a hyphen in front of it).</description>
     </key>
-    <key name="update-records" type="b">
-      <default>true</default>
-      <summary>Whether to update login records when launching terminal command</summary>
-      <description>If true, the system login records utmp and wtmp will be updated when the command inside 
the terminal is launched.</description>
-    </key>
     <key name="use-custom-command" type="b">
       <default>false</default>
       <summary>Whether to run a custom command instead of the shell</summary>
diff --git a/src/profile-editor.c b/src/profile-editor.c
index 3e8ccaf..3914507 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -1048,10 +1048,6 @@ terminal_profile_edit (GSettings  *profile,
                    "active",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET |
                    G_SETTINGS_BIND_INVERT_BOOLEAN);
-  g_settings_bind (profile, TERMINAL_PROFILE_UPDATE_RECORDS_KEY,
-                   gtk_builder_get_object (builder,
-                                           "update-records-checkbutton"),
-                   "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY,
                    gtk_builder_get_object (builder,
                                            "use-custom-command-checkbutton"),
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index eb2fa26..e128a54 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -572,20 +572,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="update-records-checkbutton">
-                                <property name="label" translatable="yes">_Update login records when command 
is launched</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkCheckButton" id="use-custom-command-checkbutton">
                                 <property name="label" translatable="yes">Ru_n a custom command instead of 
my shell</property>
                                 <property name="visible">True</property>
@@ -596,7 +582,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
-                                <property name="position">2</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
@@ -642,7 +628,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
@@ -688,7 +674,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                           </object>
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 17ffdb2..c9f7e7a 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -56,7 +56,6 @@ G_BEGIN_DECLS
 #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY           "scrollbar-policy"
 #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY        "scroll-on-keystroke"
 #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY           "scroll-on-output"
-#define TERMINAL_PROFILE_UPDATE_RECORDS_KEY             "update-records"
 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY         "use-custom-command"
 #define TERMINAL_PROFILE_USE_SKEY_KEY                   "use-skey"
 #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY            "use-system-font"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index d97f11e..4fbf77c 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1291,11 +1291,6 @@ terminal_screen_do_exec (TerminalScreen *screen,
 
   env = get_child_environment (screen, working_dir, &shell);
 
-  if (!g_settings_get_boolean (profile, TERMINAL_PROFILE_LOGIN_SHELL_KEY))
-    pty_flags |= VTE_PTY_NO_LASTLOG;
-  if (!g_settings_get_boolean (profile, TERMINAL_PROFILE_UPDATE_RECORDS_KEY))
-    pty_flags |= VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP;
-
   argv = NULL;
   if (!get_child_command (screen, shell, &spawn_flags, &argv, &err) ||
       !vte_terminal_spawn_sync (terminal,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]