Make gio optional; it's way too soon to expect everyone to have this. Fix keybindings error handling.
This commit is contained in:
parent
565b3d2bb8
commit
e244329725
|
@ -34,7 +34,11 @@ up, set a default for it first."""
|
||||||
import os, platform, sys, re
|
import os, platform, sys, re
|
||||||
import pwd
|
import pwd
|
||||||
import gtk, pango
|
import gtk, pango
|
||||||
import gio
|
|
||||||
|
try:
|
||||||
|
import gio
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
# set this to true to enable debugging output
|
# set this to true to enable debugging output
|
||||||
# These should be moved somewhere better.
|
# These should be moved somewhere better.
|
||||||
|
@ -209,9 +213,12 @@ class TerminatorConfValuestoreRC (TerminatorConfValuestore):
|
||||||
dbg(" VS_RCFile: config file located at %s" % self.rcfilename)
|
dbg(" VS_RCFile: config file located at %s" % self.rcfilename)
|
||||||
self.call_parser(True)
|
self.call_parser(True)
|
||||||
|
|
||||||
monfile = gio.File(self.rcfilename)
|
try:
|
||||||
monmon = monfile.monitor_file()
|
monfile = gio.File(self.rcfilename)
|
||||||
monmon.connect("changed", self.file_changed)
|
monmon = monfile.monitor_file()
|
||||||
|
monmon.connect("changed", self.file_changed)
|
||||||
|
except NameError:
|
||||||
|
dbg ("gio module not found, config file monitoring disabled")
|
||||||
|
|
||||||
def set_reconfigure_callback (self, function):
|
def set_reconfigure_callback (self, function):
|
||||||
dbg (" VS_RCFile: setting callback to: %s"%function)
|
dbg (" VS_RCFile: setting callback to: %s"%function)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
|
||||||
import re, gtk
|
import re, gtk
|
||||||
import terminatorlib.config
|
import terminatorlib.config
|
||||||
|
from terminatorlib.config import err
|
||||||
|
|
||||||
class KeymapError(Exception):
|
class KeymapError(Exception):
|
||||||
def __init__(self, value):
|
def __init__(self, value):
|
||||||
|
|
Loading…
Reference in New Issue