From d3a0d5193ee7cba202506e26daa0a6707cfc9858 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Mon, 30 Nov 2015 19:07:43 +0100
Subject: [PATCH] Remove unsupported utmp for now, till alternative solution

---
 terminatorlib/config.py         |  1 -
 terminatorlib/preferences.glade | 40 +++++++++------------------------
 terminatorlib/prefseditor.py    |  8 -------
 terminatorlib/terminal.py       |  2 --
 4 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/terminatorlib/config.py b/terminatorlib/config.py
index 885f943f..930b30b6 100755
--- a/terminatorlib/config.py
+++ b/terminatorlib/config.py
@@ -229,7 +229,6 @@ DEFAULTS = {
 #729fcf:#ad7fa8:#34e2e2:#eeeeec',
                 'word_chars'            : ',./?%&#:_',
                 'mouse_autohide'        : True,
-                'update_records'        : True,
                 'login_shell'           : False,
                 'use_custom_command'    : False,
                 'custom_command'        : '',
diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index 8159eabb..533e6b62 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -1962,7 +1962,7 @@
                           <object class="GtkTable" id="table5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="n_rows">5</property>
+                            <property name="n_rows">4</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">12</property>
                             <property name="row_spacing">6</property>
@@ -1982,24 +1982,6 @@
                                 <property name="y_options"/>
                               </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_action_appearance">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_update_records_checkbutton_toggled" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="y_options"/>
-                              </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>
@@ -2013,8 +1995,8 @@
                               </object>
                               <packing>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
                                 <property name="y_options"/>
                               </packing>
                             </child>
@@ -2029,8 +2011,8 @@
                                 <property name="mnemonic_widget">custom_command_entry</property>
                               </object>
                               <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"/>
                               </packing>
@@ -2046,8 +2028,8 @@
                                 <property name="mnemonic_widget">exit_action_combobox</property>
                               </object>
                               <packing>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
                                 <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"/>
                               </packing>
@@ -2067,8 +2049,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
                                 <property name="y_options"/>
                               </packing>
                             </child>
@@ -2089,8 +2071,8 @@
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
                                 <property name="y_options"/>
                               </packing>
                             </child>
diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py
index 02de5775..09706c27 100755
--- a/terminatorlib/prefseditor.py
+++ b/terminatorlib/prefseditor.py
@@ -454,9 +454,6 @@ class PrefsEditor:
         # Login shell
         widget = guiget('login_shell_checkbutton')
         widget.set_active(self.config['login_shell'])
-        # Login records
-        widget = guiget('update_records_checkbutton')
-        widget.set_active(self.config['update_records'])
         # Use Custom command
         widget = guiget('use_custom_command_checkbutton')
         widget.set_active(self.config['use_custom_command'])
@@ -740,11 +737,6 @@ class PrefsEditor:
         self.config['login_shell'] = widget.get_active()
         self.config.save()
 
-    def on_update_records_checkbutton_toggled(self, widget):
-        """Update records setting changed"""
-        self.config['update_records'] = widget.get_active()
-        self.config.save()
-
     def on_scroll_background_checkbutton_toggled(self, widget):
         """Scroll background setting changed"""
         self.config['scroll_background'] = widget.get_active()
diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index 71696e49..722dbf6b 100755
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -1334,8 +1334,6 @@ class Terminal(Gtk.VBox):
             self.cwd = cwd
 
     def spawn_child(self, widget=None, respawn=False, debugserver=False):
-        update_records = self.config['update_records']
-        login = self.config['login_shell']
         args = []
         shell = None
         command = None