Ticket #93: 0001-Use-user-shell-by-default.patch

data/guake.schemas

@@ -6 +6 @@
             <applyto>/apps/guake/general/default_shell</applyto>
             <owner>guake</owner>
             <type>string</type>
-            <default>/bin/bash</default>
+            <default></default>
             <locale name="C">
                 <short>Path to the default shell.</short>
-                <long>Path to the default shell. If an invalid shell is placed
-                here, guake will fallback to bash.</long>
+                <long>Path to the default shell. Set to empty to
+                use default user shell. If invalid path is set
+                here, guake will fallback to user shell.</long>
             </locale>
         </schema>
 

src/guake.py

@@ -894 +894 @@
         """Return all parameters to be passed to the fork_command
         method of a vte terminal.
         """
-        argv = None
-        shell = self.client.get_string(KEY('/general/default_shell')) or 'sh'
+        # use dictionary to pass named params to work around command
+        # parameter in fork_command not accepting None as argument.
+        # When we pass None as command, vte starts the default user shell.
+        params = {}
+
+        shell = self.client.get_string(KEY('/general/default_shell'))
+        if shell and os.path.exists(shell):
+            params['command'] = shell
+
         login_shell = self.client.get_bool(KEY('/general/use_login_shell'))
         if login_shell:
-            argv = ['-']
+            params['argv'] = ['-']
+
+        params['directory'] = self.get_current_dir()
+        params['loglastlog'] = login_shell
 
-        directory = self.get_current_dir()
-        return shell, argv, None, directory, login_shell, False, False
+        return params
 
     def add_tab(self, *args):
         """Adds a new tab to the terminal notebook.
@@ -915 +924 @@
         last_added = len(self.term_list)
         self.term_list.append(box.terminal)
 
-        pid = box.terminal.fork_command(*self.get_fork_params())
+        pid = box.terminal.fork_command(**self.get_fork_params())
         self.pid_list.append(pid)
 
         # Adding a new radio button to the tabbar

src/prefs.py

@@ -38 +38 @@
 # rest of the combo too.
 SHELLS_FILE = '/etc/shells'
 
+# string to show in prefereces dialog for user shell option
+USER_SHELL_VALUE = _('<user shell>')
+
 # translating our types to vte types
 ERASE_BINDINGS = {'ASCII DEL': 'ascii-delete',
                   'Escape sequence': 'delete-sequence',
@@ -98 +101 @@
         if not citer:
             return
         shell = combo.get_model().get_value(citer, 0)
-        self.client.set_string(KEY('/general/default_shell'), shell)
+        # we unset the value (restore to default) when user chooses to use
+        # user shell as guake shell interpreter.
+        if shell == USER_SHELL_VALUE:
+            self.client.unset(KEY('/general/default_shell'))
+        else:
+            self.client.set_string(KEY('/general/default_shell'), shell)
 
     def on_use_login_shell_toggled(self, chk):
         """Changes the activity of use_login_shell in gconf
@@ -358 +366 @@
         """
         # default_shell
         combo = self.get_widget('default_shell')
+        # get the value for defualt shell. If unset, set to USER_SHELL_VALUE.
+        value = self.client.get_string(KEY('/general/default_shell')) or \
+                USER_SHELL_VALUE
         for i in combo.get_model():
-            if i[0] == self.client.get_string(KEY('/general/default_shell')):
+            if i[0] == value:
                 combo.set_active_iter(i.iter)
 
         # login shell
@@ -449 +460 @@
         fill the default_shell combobox.
         """
         cb = self.get_widget('default_shell')
+        # append user shell as first option
+        cb.append_text(USER_SHELL_VALUE)
         if os.path.exists(SHELLS_FILE):
             lines = open(SHELLS_FILE).readlines()
             for i in lines: