diff --git a/debian/control b/debian/control index 96c37fb5..fdfdc6dc 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python-vte, python-gobject, python-gtk2 (>= 2.14.0), gconf2, libgtk2.0-bin XB-Python-Version: ${python:Versions} Provides: x-terminal-emulator -Recommends: xdg-utils, python-xdg, python-gnome2, deskbar-applet +Recommends: xdg-utils, python-xdg, python-gnome2, python-keybinder Description: multiple GNOME terminals in one window Terminator is a little project to produce an efficient way of filling a large area of screen space with terminals. diff --git a/terminatorlib/window.py b/terminatorlib/window.py index 793071ee..4607d663 100755 --- a/terminatorlib/window.py +++ b/terminatorlib/window.py @@ -19,10 +19,10 @@ from factory import Factory from terminator import Terminator try: - import deskbar.core.keybinder as bindkey + import keybinder except ImportError: - err('Unable to find python bindings for deskbar, "hide_window" is not' \ - 'available.') + err('Warning: python-keybinder is not installed. This means the \ +hide_window shortcut will be unavailable') # pylint: disable-msg=R0904 class Window(Container, gtk.Window): @@ -80,14 +80,14 @@ class Window(Container, gtk.Window): # Attempt to grab a global hotkey for hiding the window. # If we fail, we'll never hide the window, iconifying instead. try: - self.hidebound = bindkey.tomboy_keybinder_bind( + self.hidebound = keybinder.bind( self.config['keybindings']['hide_window'], self.on_hide_window) except (KeyError, NameError): pass if not self.hidebound: - dbg('Unable to bind hide_window key, another instance has it.') + err('Unable to bind hide_window key, another instance/window has it.') self.hidefunc = self.iconify else: self.hidefunc = self.hide