[ontv] Changed schema files to use new DBus keybindings

[Olof Kindgren <olki src gnome org>]

commit be5a531e605af17541a274b5952eb8958d0d9f11
Author: Olof Kindgren <olki src gnome org>
Date:   Thu Feb 18 22:12:37 2010 +0100

    Changed schema files to use new DBus keybindings
    
    The schema files have been changed to launch ontv with CLI switches,
    and thereby using the new DBus interface.
    BIG WARNING: Path to the ontv executable is hardcoded to
    /usr/libexec/ontv because I'm completely new to autotools and don't
    know how to substitute it to the prefix dir. (Patch wanted)

 data/90-ontv.xml.in  |    5 ++-
 data/ontv.schemas.in |   58 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 9 deletions(-)
---
diff --git a/data/90-ontv.xml.in b/data/90-ontv.xml.in
index 64fa2a0..ef4e1d4 100644
--- a/data/90-ontv.xml.in
+++ b/data/90-ontv.xml.in
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries _name="OnTV" package="ontv">
-    <KeyListEntry name="/apps/ontv/general/show_window_hotkey" />
-    <KeyListEntry name="/apps/ontv/general/show_search_program_hotkey" />
+    <KeyListEntry name="/desktop/gnome/keybindings/toggle_window_hotkey/binding" />
+    <KeyListEntry name="/desktop/gnome/keybindings/show_search_program_hotkey/binding" />
+<!--    <KeyListEntry name="/desktop/gnome/keybindings/update_tv_listings/binding" /> !-->
 </KeyListEntries>
diff --git a/data/ontv.schemas.in b/data/ontv.schemas.in
index 6f6c665..1bdb103 100644
--- a/data/ontv.schemas.in
+++ b/data/ontv.schemas.in
@@ -23,28 +23,72 @@
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/ontv/general/show_window_hotkey</key>
-            <applyto>/apps/ontv/general/show_window_hotkey</applyto>
+            <key>/schemas/desktop/gnome/keybindings/toggle_window_hotkey/binding</key>
+            <applyto>/desktop/gnome/keybindings/toggle_window_hotkey/binding</applyto>
             <owner>ontv</owner>
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Show window</short>
-                <long>Keyboard shortcut for showing the OnTV window.</long>
+                <short>Toggle program window binding</short>
+                <long>Keyboard shortcut for toggling visibility of the OnTV program window.</long>
             </locale>
         </schema>
         <schema>
-            <key>/schemas/apps/ontv/general/show_search_program_hotkey</key>
-            <applyto>/apps/ontv/general/show_search_program_hotkey</applyto>
+            <key>/schemas/desktop/gnome/keybindings/toggle_window_hotkey/action</key>
+            <applyto>/desktop/gnome/keybindings/toggle_window_hotkey/action</applyto>
+            <owner>ontv</owner>
+            <type>string</type>
+            <default>/usr/libexec/ontv -wt</default>
+            <locale name="C">
+                <short>Toggle program window action</short>
+                <long>Command for toggling visibility of the OnTV program window.</long>
+            </locale>
+        </schema>
+        <schema>
+            <key>/schemas/desktop/gnome/keybindings/toggle_window_hotkey/name</key>
+            <applyto>/desktop/gnome/keybindings/toggle_window_hotkey/name</applyto>
+            <owner>ontv</owner>
+            <type>string</type>
+            <default>Toggle OnTV program window</default>
+            <locale name="C">
+                <short>Toggle OnTV program window</short>
+                <long>Toggle visibility of the OnTV program window.</long>
+            </locale>
+        </schema>
+        <schema>
+            <key>/schemas/desktop/gnome/keybindings/show_search_program_hotkey/binding</key>
+            <applyto>/desktop/gnome/keybindings/show_search_program_hotkey/binding</applyto>
             <owner>ontv</owner>
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Show search program</short>
+                <short>Show search program binding</short>
                 <long>Keyboard shortcut for showing the search program window.</long>
             </locale>
         </schema>
         <schema>
+            <key>/schemas/desktop/gnome/keybindings/show_search_program_hotkey/action</key>
+            <applyto>/desktop/gnome/keybindings/show_search_program_hotkey/action</applyto>
+            <owner>ontv</owner>
+            <type>string</type>
+            <default>/usr/libexec/ontv -ws</default>
+            <locale name="C">
+                <short>Show search program action</short>
+                <long>Command for showing the search program window.</long>
+            </locale>
+        </schema>
+        <schema>
+            <key>/schemas/desktop/gnome/keybindings/show_search_program_hotkey/name</key>
+            <applyto>/desktop/gnome/keybindings/show_search_program_hotkey/name</applyto>
+            <owner>ontv</owner>
+            <type>string</type>
+            <default>Show OnTV search window</default>
+            <locale name="C">
+                <short>Show search program dialog</short>
+                <long>Show search program dialog.</long>
+            </locale>
+        </schema>
+        <schema>
             <key>/schemas/apps/ontv/general/display_current_programs</key>
             <applyto>/apps/ontv/general/display_current_programs</applyto>
             <owner>ontv</owner>