[ontv] Remove keybinder module

[Olof Kindgren <olki src gnome org>]

commit 2419bbdb694fb22cdb2f802d6853880f4d123c99
Author: Olof Kindgren <olki src gnome org>
Date:   Wed Feb 24 21:06:21 2010 +0100

    Remove keybinder module
    
    Keybinder functionality is now implemented with dbus instead.
    The dependency on gnome-python-extras is not needed anymore.

 configure.ac                       |    2 -
 ontv/Makefile.am                   |    3 -
 ontv/applet.py                     |    3 -
 ontv/dialogs.py                    |   34 --
 ontv/key_binder.py                 |   78 -----
 ontv/keybinder/Makefile.am         |   35 --
 ontv/keybinder/__init__.py         |    1 -
 ontv/keybinder/_keybinder.defs     |   40 ---
 ontv/keybinder/_keybinder.override |  139 --------
 ontv/keybinder/_keybindermodule.c  |   32 --
 ontv/keybinder/eggaccelerators.c   |  657 ------------------------------------
 ontv/keybinder/eggaccelerators.h   |   87 -----
 ontv/keybinder/gen-defs.sh         |    6 -
 ontv/keybinder/tomboykeybinder.c   |  320 ------------------
 ontv/keybinder/tomboykeybinder.h   |   27 --
 15 files changed, 0 insertions(+), 1464 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4a520df..251a6ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ PKG_CHECK_MODULES(ONTV,
 	pygtk-2.0 >= 2.10.0
 	pygobject-2.0 >= 2.12.0
 	gnome-python-2.0 >= 2.16.0
-	gnome-python-extras-2.0 >= 2.14.2
 	notify-python >= 0.1.1)
 
 AC_MSG_CHECKING([for vte module])
@@ -103,7 +102,6 @@ data/Makefile
 data/images/Makefile
 ontv/__init__.py
 ontv/Makefile
-ontv/keybinder/Makefile
 bin/Makefile
 po/Makefile.in
 ])
diff --git a/ontv/Makefile.am b/ontv/Makefile.am
index ba5b5e2..caf67ac 100644
--- a/ontv/Makefile.am
+++ b/ontv/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = keybinder
-
 ontvdir = $(pythondir)/ontv
 
 ontv_PYTHON =			\
@@ -11,7 +9,6 @@ ontv_PYTHON =			\
 	dialogs.py		\
 	gui.py			\
 	__init__.py		\
-	key_binder.py		\
 	listings.py		\
 	main.py			\
 	notify.py		\
diff --git a/ontv/applet.py b/ontv/applet.py
index 0c5910d..49d5bb3 100644
--- a/ontv/applet.py
+++ b/ontv/applet.py
@@ -32,7 +32,6 @@ from assistant import XMLTVAssistant
 from config import Configuration
 from dbus_service import DBusService
 from dialogs import PreferencesDialog, SearchDialog
-from key_binder import KeyBinder
 from reminders import Reminders
 from window import ProgramWindow
 from xmltv_file import XMLTVFile
@@ -60,8 +59,6 @@ class OnTVApplet(object):
         if os.path.exists(self.reminders.file):
             self.reminders = self.reminders.load()
 
-        self.kb = KeyBinder(self.config)
-        self.kb.connect("activated", self.__kb_activated)
 
         self.pw = ProgramWindow(self.xmltvfile, self.applet,
                                 self.get_docking_data)
diff --git a/ontv/dialogs.py b/ontv/dialogs.py
index c9a6297..b9f2a57 100644
--- a/ontv/dialogs.py
+++ b/ontv/dialogs.py
@@ -127,7 +127,6 @@ class PreferencesDialog:
         self.config = ontvapplet.config
         self.xmltvfile = ontvapplet.xmltvfile
         self.reminders = ontvapplet.reminders
-        self.kb = ontvapplet.kb
         self.pw = ontvapplet.pw
         self.sd = ontvapplet.sd
 
@@ -514,10 +513,6 @@ class PreferencesDialog:
                                self.__grabber_command_key_changed)
         self.config.add_notify(config.KEY_XMLTV_FILE,
                                self.__xmltv_file_key_changed)
-        self.config.add_notify(config.KEY_SHOW_WINDOW_HOTKEY,
-                               self.__show_window_hotkey_key_changed)
-        self.config.add_notify(config.KEY_SHOW_SEARCH_PROGRAM_HOTKEY,
-                               self.__show_search_program_hotkey_key_changed)
         self.config.add_notify(config.KEY_DISPLAY_CURRENT_PROGRAMS,
                                self.__display_current_programs_key_changed)
         self.config.add_notify(config.KEY_DISPLAY_UPCOMING_PROGRAMS,
@@ -536,35 +531,6 @@ class PreferencesDialog:
             self.xmltvfile.props.path = xmltv_file
             self.output_file_entry.set_text(xmltv_file)
 
-    def __show_window_hotkey_key_changed(self, client, cnxn_id, entry, data):
-        if not entry.value:
-            return
-        elif entry.value.type == gconf.VALUE_STRING:
-            # Unbind the current binding if any
-            if self.kb.props.show_window_hotkey != "":
-                self.kb.unbind(self.kb.props.show_window_hotkey)
-
-            value = entry.value.to_string()
-            if value != "":
-                self.kb.props.show_window_hotkey = value
-        else:
-            pass # TODO: Output error msg
-
-    def __show_search_program_hotkey_key_changed(self, client, cnxn_id, entry,
-                                                 data):
-        if not entry.value:
-            return
-        elif entry.value.type == gconf.VALUE_STRING:
-            # Unbind the current binding if any
-            if self.kb.props.show_search_program_hotkey != "":
-                self.kb.unbind(self.kb.props.show_search_program_hotkey)
-
-            value = entry.value.to_string()
-            if value != "":
-                self.kb.props.show_search_program_hotkey = value
-        else:
-            pass # TODO: Output error msg
-
     def __display_current_programs_key_changed(self, client, cnxn_id, entry,
                                                data):
         if not entry.value: