[Xfce4-commits] [apps/xfce4-terminal] 01/01: Remove "Update utmp/wtmp records" setting

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit ef0213c70d3668073a73057a8c457dfd0f633ec3
Author: Igor <f2404 at yandex.ru>
Date:   Mon Sep 5 17:32:42 2016 +0300

    Remove "Update utmp/wtmp records" setting
    
    Remove "Update utmp/wtmp records when command is launched" setting since
    the feature has been removed from vte.
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12817
---
 terminal/terminal-preferences-dialog.c |  2 +-
 terminal/terminal-preferences.c        | 11 -----------
 terminal/terminal-preferences.glade    | 16 ----------------
 terminal/terminal-screen.c             |  7 ++-----
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index b88b59b..de359cc 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -137,7 +137,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
   gchar            *current;
   GtkTreeIter       current_iter;
   const gchar      *props_active[] = { "title-mode", "command-login-shell",
-                                       "command-update-records", "scrolling-single-line",
+                                       "scrolling-single-line",
                                        "scrolling-on-output", "scrolling-on-keystroke",
                                        "scrolling-bar", "scrolling-unlimited",
                                        "misc-cursor-shape", "misc-cursor-blinks",
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 0b49b5e..9cb73d4 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -58,7 +58,6 @@ enum
   PROP_COLOR_BOLD,
   PROP_COLOR_BOLD_USE_DEFAULT,
   PROP_COLOR_PALETTE,
-  PROP_COMMAND_UPDATE_RECORDS,
   PROP_COMMAND_LOGIN_SHELL,
   PROP_DROPDOWN_ANIMATION_TIME,
   PROP_DROPDOWN_KEEP_OPEN_DEFAULT,
@@ -479,16 +478,6 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   /**
-   * TerminalPreferences:command-update-records:
-   **/
-  preferences_props[PROP_COMMAND_UPDATE_RECORDS] =
-      g_param_spec_boolean ("command-update-records",
-                            NULL,
-                            "CommandUpdateRecords",
-                            TRUE,
-                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
-  /**
    * TerminalPreferences:command-login-shell:
    **/
   preferences_props[PROP_COMMAND_LOGIN_SHELL] =
diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index 8d85808..d18b881 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -392,22 +392,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="command-update-records">
-                                <property name="label" translatable="yes">_Update utmp/wtmp 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">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 23f4d92..3473fba 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1570,13 +1570,13 @@ terminal_screen_urgent_bell (TerminalWidget *widget,
 void
 terminal_screen_launch_child (TerminalScreen *screen)
 {
-  gboolean      update;
   GError       *error = NULL;
   gchar        *command;
   gchar       **argv;
   gchar       **env;
   gchar       **argv2;
   guint         i;
+  VtePtyFlags   pty_flags = VTE_PTY_DEFAULT;
   GSpawnFlags   spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH;
 
   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
@@ -1595,9 +1595,6 @@ terminal_screen_launch_child (TerminalScreen *screen)
     }
   else
     {
-      g_object_get (G_OBJECT (screen->preferences),
-                    "command-update-records", &update,
-                    NULL);
       env = terminal_screen_get_child_environment (screen);
 
       argv2 = g_new0 (gchar *, g_strv_length (argv) + 2);
@@ -1612,7 +1609,7 @@ terminal_screen_launch_child (TerminalScreen *screen)
         }
 
       if (!vte_terminal_spawn_sync (VTE_TERMINAL (screen->terminal),
-                                           update ? VTE_PTY_DEFAULT : VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
+                                           pty_flags,
                                            screen->working_directory, argv2, env,
                                            spawn_flags,
                                            NULL, NULL,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.