Changeset 23ad51b105f191c931f4cf908dfe28c07e4f3876

Timestamp:

03/12/09 11:30:32 (3 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

6bc67508d7815dd6e33663252591bb7a553da606

Parents:

6764d9cf7f48f1dd5cf0754cf8785031aa135323

git-author:

Aleksandar Krsteski <alekrsteski@…> (03/03/09 23:58:58)

git-committer:

Lincoln de Sousa <lincoln@…> (03/12/09 11:30:32)

Message:

Use user shell by default.

Guake should use user shell defined for the user in /etc/passwd by
default. Also add an option to select user shell in preferences so the
user can return to user shell option after selection another shell.
Implementation uses the user shell by passing None to vte command
argument. Also fallback to user shell if default_shell option defines
invalid path.

Files:

• data/guake.schemas (modified) (1 diff)
• src/guake.py (modified) (2 diffs)
• src/prefs.py (modified) (4 diffs)

data/guake.schemas

@@ -7 +7 @@
             <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

@@ -903 +903 @@
         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 = ['-']
-
-        directory = self.get_current_dir()
-        return shell, argv, None, directory, login_shell, False, False
+            params['argv'] = ['-']
+
+        params['directory'] = self.get_current_dir()
+        params['loglastlog'] = login_shell
+
+        return params
 
     def add_tab(self, *args):
@@ -924 +933 @@
         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)
 

src/prefs.py

@@ -39 +39 @@
 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',
@@ -99 +102 @@
             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):
@@ -359 +367 @@
         # 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)
 
@@ -450 +461 @@
         """
         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()