Skip to content
Permalink
Browse files

drop umtp suport

Fixes #104

This doesn't work with with gtk+-3 and newer vte versions.
With gnome-pty-helper gone, it's a no-op.

based on origin commit at
https://git.gnome.org/browse/gnome-terminal/commit/?id=d3aa520
https://bugzilla.gnome.org/show_bug.cgi?id=747046
  • Loading branch information...
raveit65 committed Feb 6, 2018
1 parent d342a01 commit 550b622cb7bff4a48ebdb3a8dbb01c1dba740bc2
@@ -198,11 +198,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>
@@ -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);
@@ -944,22 +944,6 @@ Author: Wolfgang Ulbrich
<property name="position">0</property>
</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="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">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>
@@ -973,7 +957,7 @@ Author: Wolfgang Ulbrich
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
@@ -1020,7 +1004,7 @@ Author: Wolfgang Ulbrich
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
<child>
@@ -1067,7 +1051,7 @@ Author: Wolfgang Ulbrich
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
<property name="position">3</property>
</packing>
</child>
</object>
@@ -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);
@@ -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"
@@ -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,20 +1559,13 @@ 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)
working_dir = priv->initial_working_directory;
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);

0 comments on commit 550b622

Please sign in to comment.
You can’t perform that action at this time.