[gok] Fix the gconf schema generation for Feedback options - bgo#595477

[Gerd Kohlberger <gerdk src gnome org>]

commit cfd21948f1e87999d29081c43f3da536d3778f36
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Sun Nov 15 14:46:20 2009 +0100

    Fix the gconf schema generation for Feedback options - bgo#595477

 gok-with-references.schemas.in |   14 +++++++-------
 gok-with-references.schemas.m4 |    7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/gok-with-references.schemas.in b/gok-with-references.schemas.in
index b29298b..6093335 100644
--- a/gok-with-references.schemas.in
+++ b/gok-with-references.schemas.in
@@ -1322,7 +1322,7 @@
       <applyto>/apps/gok/feedbacks/none/permanent</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Is this feedback permanent</short>
         <long></long>
@@ -1399,7 +1399,7 @@
       <applyto>/apps/gok/feedbacks/key_flashing/permanent</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Is this feedback permanent</short>
         <long></long>
@@ -1465,7 +1465,7 @@
       <applyto>/apps/gok/feedbacks/goksound1/speech</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
         <short>Does this feedback speak the label of a GOK key</short>
         <long></long>
@@ -1476,7 +1476,7 @@
       <applyto>/apps/gok/feedbacks/goksound1/permanent</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Is this feedback permanent</short>
         <long></long>
@@ -1542,7 +1542,7 @@
       <applyto>/apps/gok/feedbacks/goksound2/speech</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
         <short>Does this feedback speak the label of a GOK key</short>
         <long></long>
@@ -1553,7 +1553,7 @@
       <applyto>/apps/gok/feedbacks/goksound2/permanent</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Is this feedback permanent</short>
         <long></long>
@@ -1619,7 +1619,7 @@
       <applyto>/apps/gok/feedbacks/gokspeech/speech</applyto>
       <owner>gok</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Does this feedback speak the label of a GOK key</short>
         <long></long>
diff --git a/gok-with-references.schemas.m4 b/gok-with-references.schemas.m4
index f296b1e..3dc46b1 100644
--- a/gok-with-references.schemas.m4
+++ b/gok-with-references.schemas.m4
@@ -87,7 +87,8 @@ dnl $3 = flash
 dnl $4 = number of flashes
 dnl $5 = sound
 dnl $6 = soundname
-dnl $7 = permanent
+dnl $7 = speech
+dnl $8 = permanent
 define(`mkfeedback', mkschema_i18n_default(`feedbacks/$1/displayname', `string', $2,
                          `The name to display to the user for this feedback',
                          `')
@@ -103,10 +104,10 @@ define(`mkfeedback', mkschema_i18n_default(`feedbacks/$1/displayname', `string',
     mkschema(`feedbacks/$1/soundname', `string', $6,
              `The name of the sound that this feedback will play',
              `')
-    mkschema(`feedbacks/$1/speech', `bool', $5,
+    mkschema(`feedbacks/$1/speech', `bool', $7,
              `Does this feedback speak the label of a GOK key',
              `')
-    mkschema(`feedbacks/$1/permanent', `bool', $7,
+    mkschema(`feedbacks/$1/permanent', `bool', $8,
              `Is this feedback permanent',
              `'))