From d19b94c653f856eca5f63637ebe65ca80ab3bf81 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Wed, 11 Jun 2008 00:21:05 +0100 Subject: [PATCH] Prioritise GConf over RC when --profile is specified. Closes LP #238039 --- terminator | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/terminator b/terminator index 54eb952b..87a68c97 100755 --- a/terminator +++ b/terminator @@ -885,7 +885,7 @@ text/plain self._vte.destroy() 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.command = command @@ -900,7 +900,13 @@ class Terminator: import gconf store = config.TerminatorConfValuestoreGConf () 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: pass