diff --git a/src/org.mate.terminal.gschema.xml.in b/src/org.mate.terminal.gschema.xml.in index a9a2dec..21c0be3 100644 --- a/src/org.mate.terminal.gschema.xml.in +++ b/src/org.mate.terminal.gschema.xml.in @@ -198,11 +198,6 @@ Whether to launch the command in the terminal as a login shell If true, the command inside the terminal will be launched as a login shell. (argv[0] will have a hyphen in front of it.) - - true - Whether to update login records when launching terminal command - If true, the system login records utmp and wtmp will be updated when the command inside the terminal is launched. - false Whether to run a custom command instead of the shell diff --git a/src/profile-editor.c b/src/profile-editor.c index e3667eb..3b41ddd 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -309,10 +309,6 @@ profile_notify_sensitivity_cb (TerminalProfile *profile, SET_SENSITIVE ("login-shell-checkbutton", !terminal_profile_property_locked (profile, TERMINAL_PROFILE_LOGIN_SHELL)); - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_UPDATE_RECORDS)) - SET_SENSITIVE ("update-records-checkbutton", - !terminal_profile_property_locked (profile, TERMINAL_PROFILE_UPDATE_RECORDS)); - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_PALETTE)) { gboolean palette_locked = terminal_profile_property_locked (profile, TERMINAL_PROFILE_PALETTE); @@ -824,7 +820,6 @@ terminal_profile_edit (TerminalProfile *profile, CONNECT ("title-entry", TERMINAL_PROFILE_TITLE); CONNECT ("title-mode-combobox", TERMINAL_PROFILE_TITLE_MODE); CONNECT ("transparent-radiobutton", TERMINAL_PROFILE_BACKGROUND_TYPE); - CONNECT ("update-records-checkbutton", TERMINAL_PROFILE_UPDATE_RECORDS); CONNECT ("use-custom-command-checkbutton", TERMINAL_PROFILE_USE_CUSTOM_COMMAND); CONNECT ("use-custom-default-size-checkbutton", TERMINAL_PROFILE_USE_CUSTOM_DEFAULT_SIZE); CONNECT ("use-theme-colors-checkbutton", TERMINAL_PROFILE_USE_THEME_COLORS); diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui index 9c50d54..131a810 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -944,22 +944,6 @@ Author: Wolfgang Ulbrich 0 - - - _Update login records when command is launched - True - True - False - start - True - True - - - False - False - 1 - - Ru_n a custom command instead of my shell @@ -973,7 +957,7 @@ Author: Wolfgang Ulbrich False False - 2 + 1 @@ -1020,7 +1004,7 @@ Author: Wolfgang Ulbrich False True - 3 + 2 @@ -1067,7 +1051,7 @@ Author: Wolfgang Ulbrich True True - 4 + 3 diff --git a/src/terminal-profile.c b/src/terminal-profile.c index 738c80a..02daa6a 100644 --- a/src/terminal-profile.c +++ b/src/terminal-profile.c @@ -76,7 +76,6 @@ enum PROP_SILENT_BELL, PROP_TITLE, PROP_TITLE_MODE, - PROP_UPDATE_RECORDS, PROP_USE_CUSTOM_COMMAND, PROP_USE_CUSTOM_DEFAULT_SIZE, PROP_USE_SKEY, @@ -118,7 +117,6 @@ enum #define KEY_COPY_SELECTION "copy-selection" #define KEY_TITLE_MODE "title-mode" #define KEY_TITLE "title" -#define KEY_UPDATE_RECORDS "update-records" #define KEY_USE_CUSTOM_COMMAND "use-custom-command" #define KEY_USE_CUSTOM_DEFAULT_SIZE "use-custom-default-size" #define KEY_USE_SKEY "use-skey" @@ -159,7 +157,6 @@ enum #define DEFAULT_COPY_SELECTION (FALSE) #define DEFAULT_TITLE_MODE (TERMINAL_TITLE_REPLACE) #define DEFAULT_TITLE (N_("Terminal")) -#define DEFAULT_UPDATE_RECORDS (TRUE) #define DEFAULT_USE_CUSTOM_COMMAND (FALSE) #define DEFAULT_USE_CUSTOM_DEFAULT_SIZE (FALSE) #define DEFAULT_USE_SKEY (TRUE) @@ -1298,7 +1295,6 @@ terminal_profile_class_init (TerminalProfileClass *klass) TERMINAL_PROFILE_PROPERTY_BOOLEAN (SCROLL_ON_OUTPUT, DEFAULT_SCROLL_ON_OUTPUT, KEY_SCROLL_ON_OUTPUT); TERMINAL_PROFILE_PROPERTY_BOOLEAN (SILENT_BELL, DEFAULT_SILENT_BELL, KEY_SILENT_BELL); TERMINAL_PROFILE_PROPERTY_BOOLEAN (COPY_SELECTION, DEFAULT_COPY_SELECTION, KEY_COPY_SELECTION); - TERMINAL_PROFILE_PROPERTY_BOOLEAN (UPDATE_RECORDS, DEFAULT_UPDATE_RECORDS, KEY_UPDATE_RECORDS); TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_COMMAND, DEFAULT_USE_CUSTOM_COMMAND, KEY_USE_CUSTOM_COMMAND); TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_CUSTOM_DEFAULT_SIZE, DEFAULT_USE_CUSTOM_DEFAULT_SIZE, KEY_USE_CUSTOM_DEFAULT_SIZE); TERMINAL_PROFILE_PROPERTY_BOOLEAN (USE_SKEY, DEFAULT_USE_SKEY, KEY_USE_SKEY); diff --git a/src/terminal-profile.h b/src/terminal-profile.h index ae6db5c..007766f 100644 --- a/src/terminal-profile.h +++ b/src/terminal-profile.h @@ -98,7 +98,6 @@ typedef enum #define TERMINAL_PROFILE_COPY_SELECTION "copy-selection" #define TERMINAL_PROFILE_TITLE_MODE "title-mode" #define TERMINAL_PROFILE_TITLE "title" -#define TERMINAL_PROFILE_UPDATE_RECORDS "update-records" #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND "use-custom-command" #define TERMINAL_PROFILE_USE_CUSTOM_DEFAULT_SIZE "use-custom-default-size" #define TERMINAL_PROFILE_USE_SKEY "use-skey" diff --git a/src/terminal-screen.c b/src/terminal-screen.c index 7328c0a..d63728c 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -1546,7 +1546,6 @@ terminal_screen_launch_child_cb (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; VteTerminal *terminal = VTE_TERMINAL (screen); - TerminalProfile *profile; char **env, **argv; char *shell = NULL; GError *err = NULL; @@ -1560,8 +1559,6 @@ terminal_screen_launch_child_cb (TerminalScreen *screen) "[screen %p] now launching the child process\n", screen); - profile = priv->profile; - env = get_child_environment (screen, &shell); if (priv->initial_working_directory) @@ -1569,11 +1566,6 @@ terminal_screen_launch_child_cb (TerminalScreen *screen) else working_dir = g_get_home_dir (); - if (!terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_LOGIN_SHELL)) - pty_flags |= VTE_PTY_NO_LASTLOG; - if (!terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_UPDATE_RECORDS)) - pty_flags |= VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP; - if (!get_child_command (screen, shell, &spawn_flags, &argv, &err)) { handle_error_child (screen, err);