Prioritise GConf over RC when --profile is specified. Closes LP #238039

This commit is contained in:
Chris Jones 2008-06-11 00:21:05 +01:00
parent 6e148aa0d2
commit d19b94c653
1 changed files with 8 additions and 2 deletions

View File

@ -885,7 +885,7 @@ text/plain
self._vte.destroy() self._vte.destroy()
class Terminator: class Terminator:
def __init__ (self, profile, command = None, fullscreen = False, maximise = False, borderless = False): def __init__ (self, profile = None, command = None, fullscreen = False, maximise = False, borderless = False):
self.profile = profile self.profile = profile
self.command = command self.command = command
@ -900,7 +900,13 @@ class Terminator:
import gconf import gconf
store = config.TerminatorConfValuestoreGConf () store = config.TerminatorConfValuestoreGConf ()
store.set_reconfigure_callback (self.reconfigure_vtes) store.set_reconfigure_callback (self.reconfigure_vtes)
stores.append (store) dbg ('Terminator__init__: comparing %s and %s'%(profile, store.profile.split ('/').pop ()))
if profile == store.profile.split ('/').pop ():
# If we have been given a profile, and we loaded it, we should be higher priority than RC
dbg ('Terminator__init__: placing GConf before RC')
stores.insert (0, store)
else:
stores.append (store)
except: except:
pass pass