itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(trunk-1613) Fix launcher opening after a dbus enabled window is already open (DBUS in GTK3 still FIXME)

This commit is contained in:
Stephen Boddy 2015-09-01 22:59:36 +02:00
parent f64d3e67fa
commit b7b8888745
1 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
terminator
View File

@ -60,6 +60,10 @@ if __name__ == '__main__':
OPTIONS = terminatorlib.optionparse.parse_options() OPTIONS = terminatorlib.optionparse.parse_options()
if OPTIONS.select:
# launch gui, return selection
LAYOUTLAUNCHER=LayoutLauncher()
else:
# Attempt to import our dbus server. If one exists already we will just # Attempt to import our dbus server. If one exists already we will just
# connect to that and ask for a new window. If not, we will create one and # connect to that and ask for a new window. If not, we will create one and
# continue. Failure to import dbus, or the global config option "dbus" # continue. Failure to import dbus, or the global config option "dbus"
@ -104,10 +108,7 @@ if __name__ == '__main__':
TERMINATOR.set_origcwd(ORIGCWD) TERMINATOR.set_origcwd(ORIGCWD)
TERMINATOR.set_dbus_data(dbus_service) TERMINATOR.set_dbus_data(dbus_service)
TERMINATOR.reconfigure() TERMINATOR.reconfigure()
if OPTIONS.select:
# launch gui, return selection
LAYOUTLAUNCHER=LayoutLauncher()
else:
try: try:
dbg('Creating a terminal with layout: %s' % OPTIONS.layout) dbg('Creating a terminal with layout: %s' % OPTIONS.layout)
TERMINATOR.create_layout(OPTIONS.layout) TERMINATOR.create_layout(OPTIONS.layout)