[dasher] Make sure dasher.schemas gets regenerated if the parameters change, and xmlify.



commit 8b39e71bfa09711ef2613e6730403eedda5adb58
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Fri Dec 4 16:30:23 2009 +0000

    Make sure dasher.schemas gets regenerated if the parameters change, and xmlify.

 ChangeLog                   |    1 +
 Data/Makefile.am            |    2 +-
 Src/DasherCore/Parameters.h |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 70edb6b..a84609c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-12-04  Patrick Welche <prlw1 cam ac uk>
 
 	* da.po: Work around old gettext bug
+	* appease schemas
 
 2009-12-04  Alan Lawrence <acl33 inf phy cam ac uk>
 
diff --git a/Data/Makefile.am b/Data/Makefile.am
index 91b1a90..93fccc7 100644
--- a/Data/Makefile.am
+++ b/Data/Makefile.am
@@ -26,7 +26,7 @@ install-data-local: install-schemas
 # which is then moved installed in the usual way. None of this happens
 # if configure is told not to install schemas.
 
-dasher.schemas:
+dasher.schemas: ../Src/Gtk2/generate-schema
 	echo -n "Generating schema ... "; \
 	../Src/Gtk2/generate-schema > dasher.schemas; \
 	echo "done.";
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index ee827c7..e252930 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -166,9 +166,9 @@ static bp_table boolparamtable[] = {
   {BP_CIRCLE_START, "CircleStart", PERS, false, "Start on circle mode"},
   {BP_GLOBAL_KEYBOARD, "GlobalKeyboard", PERS, false, "Whether to assume global control of the keyboard"},
 #if defined(WITH_MAEMO) || defined(TARGET_OS_IPHONE)
-  {BP_NONLINEAR_Y, "NonlinearY", PERS, false, "Apply nonlinearities to Y axis (i.e. compress top & bottom)"},
+  {BP_NONLINEAR_Y, "NonlinearY", PERS, false, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
 #else
-  {BP_NONLINEAR_Y, "NonlinearY", PERS, true, "Apply nonlinearities to Y axis (i.e. compress top & bottom)"},
+  {BP_NONLINEAR_Y, "NonlinearY", PERS, true, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
 #endif
   {BP_SMOOTH_OFFSET, "DelayView", !PERS, false, "Smooth dynamic-button-mode jumps over several frames"},
   {BP_CONVERSION_MODE, "ConversionMode", !PERS, false, "Whether Dasher is operating in conversion (eg Japanese) mode"},



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]