From e56f99669cecaece32875fdad5b7b2ebc6eeeb1f Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Wed, 16 Oct 2013 15:22:56 +0000
Subject: [PATCH] Prefs migration: migrate ofx and aqbanking prefs if these
 options were enabled at build time

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23294 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 configure.ac                                  |  9 +++
 ...able-prefs.xml => migratable-prefs.xml.in} | 61 +------------------
 src/import-export/aqbanking/Makefile.am       |  2 +-
 .../aqbanking/migratable-prefs-aqbanking.xml  | 45 ++++++++++++++
 src/import-export/ofx/Makefile.am             |  2 +-
 .../ofx/migratable-prefs-ofx.xml              | 10 +++
 6 files changed, 68 insertions(+), 61 deletions(-)
 rename src/app-utils/{migratable-prefs.xml => migratable-prefs.xml.in} (94%)
 create mode 100644 src/import-export/aqbanking/migratable-prefs-aqbanking.xml
 create mode 100644 src/import-export/ofx/migratable-prefs-ofx.xml

diff --git a/configure.ac b/configure.ac
index eae003f5c8..0572164cf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,11 +659,15 @@ case "${want_ofx}" in
   no)   AC_MSG_RESULT(no) ;;
   auto) AC_MSG_RESULT(yes -- automatic test) ;;
 esac
+
+MIGRATABLE_PREFS_OFX="/dev/null"
 if test x${want_ofx} != xno ; then
   PKG_CHECK_MODULES(LIBOFX, libofx, [want_ofx="yes"], [want_ofx="no"])
   _COMPONENTS="$_COMPONENTS ofx"
+  MIGRATABLE_PREFS_OFX="$srcdir/src/import-export/ofx/migratable-prefs-ofx.xml"
 fi
 AM_CONDITIONAL([WITH_OFX], [test "x${want_ofx}" != xno])
+AC_SUBST_FILE([MIGRATABLE_PREFS_OFX])
 ### --------------------------------------------------------------------------
 ### MT940
 AC_ARG_ENABLE( mt940,
@@ -685,6 +689,8 @@ AC_ARG_ENABLE( hbci,
   if test "x$enableval" != "xno" ; then
     AC_MSG_ERROR([--enable-hbci is obsolete -- the option has been renamed into --enable-aqbanking])
   fi)
+
+MIGRATABLE_PREFS_AQBANKING="/dev/null"
 if test x${want_aqbanking} = xyes ;
 then
   # Check for Aqbanking library
@@ -707,8 +713,10 @@ then
   AC_SUBST(AQBANKING_LIBS)
   AC_SUBST(AQBANKING_CFLAGS)
   _COMPONENTS="$_COMPONENTS aqbanking"
+  MIGRATABLE_PREFS_AQBANKING="$srcdir/src/import-export/aqbanking/migratable-prefs-aqbanking.xml"
 fi
 AM_CONDITIONAL([WITH_AQBANKING], [test x${want_aqbanking} = xyes])
+AC_SUBST_FILE([MIGRATABLE_PREFS_AQBANKING])
 
 AC_ARG_WITH(qt3_wizard_package,
                  [AS_HELP_STRING([--with-qt3-wizard-package=name],[name of package containing qt3-wizard (aqbanking)])],
@@ -1392,6 +1400,7 @@ AC_CONFIG_FILES(
   dnl # non-makefiles
   packaging/win32/gnucash.iss
   src/bin/gnucash.rc
+  src/app-utils/migratable-prefs.xml
   src/gnome/gnucash.desktop.in
 
   dnl # Please read doc/build-system before adding *anything* here
diff --git a/src/app-utils/migratable-prefs.xml b/src/app-utils/migratable-prefs.xml.in
similarity index 94%
rename from src/app-utils/migratable-prefs.xml
rename to src/app-utils/migratable-prefs.xml.in
index 8635483546..fdb9f14c90 100644
--- a/src/app-utils/migratable-prefs.xml
+++ b/src/app-utils/migratable-prefs.xml.in
@@ -717,18 +717,7 @@
     </pref>
   </prefsgroup>
 
-<!--
-  <prefsgroup>
-    <gschemaid>org.gnucash.dialogs.import.ofx</gschemaid>
-    <gconfpath>dialogs-import-ofx.xml</gconfpath>
-    
-    <pref>
-      <gschemaname>last-path</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>last_path</gconfkey>
-    </pref>
-  </prefsgroup>
-  -->
+@MIGRATABLE_PREFS_OFX@
 
   <prefsgroup>
     <gschemaid>org.gnucash.dialogs.export.csv</gschemaid>
@@ -746,53 +735,7 @@
     </pref>
   </prefsgroup>
 
-<!--
-  <prefsgroup>
-    <gschemaid>org.gnucash.dialogs.import.hbci</gschemaid>
-    <gconfpath>dialogs-import-hbci.xml</gconfpath>
-    
-    <pref>
-      <gschemaname>close-on-finish</gschemaname>
-      <gschematype>b</gschematype>
-      <gconfkey>close_on_finish</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>remember-pin</gschemaname>
-      <gschematype>b</gschematype>
-      <gconfkey>remember_pin</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>verbose-debug</gschemaname>
-      <gschematype>b</gschematype>
-      <gconfkey>verbose_debug</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>format-dtaus</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>format_dtaus</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>format-csv</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>format_csv</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>format-swift-mt940</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>format_swift_mt940</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>format-swift-mt942</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>format_swift_mt942</gconfkey>
-    </pref>
-    <pref>
-      <gschemaname>last-path</gschemaname>
-      <gschematype>s</gschematype>
-      <gconfkey>last_path</gconfkey>
-    </pref>
-  </prefsgroup>
-  -->
+@MIGRATABLE_PREFS_AQBANKING@
 
   <prefsgroup>
     <gschemaid>org.gnucash.dialogs.import.generic</gschemaid>
diff --git a/src/import-export/aqbanking/Makefile.am b/src/import-export/aqbanking/Makefile.am
index 16a7a2fb29..ee169c49fe 100644
--- a/src/import-export/aqbanking/Makefile.am
+++ b/src/import-export/aqbanking/Makefile.am
@@ -75,6 +75,6 @@ gtkbuilder_DATA = \
   assistant-ab-initial.glade \
   dialog-ab.glade
 
-EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
+EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} migratable-prefs-aqbanking.xml
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
diff --git a/src/import-export/aqbanking/migratable-prefs-aqbanking.xml b/src/import-export/aqbanking/migratable-prefs-aqbanking.xml
new file mode 100644
index 0000000000..25805fa77a
--- /dev/null
+++ b/src/import-export/aqbanking/migratable-prefs-aqbanking.xml
@@ -0,0 +1,45 @@
+  <prefsgroup>
+    <gschemaid>org.gnucash.dialogs.import.hbci</gschemaid>
+    <gconfpath>dialogs-import-hbci.xml</gconfpath>
+    
+    <pref>
+      <gschemaname>close-on-finish</gschemaname>
+      <gschematype>b</gschematype>
+      <gconfkey>close_on_finish</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>remember-pin</gschemaname>
+      <gschematype>b</gschematype>
+      <gconfkey>remember_pin</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>verbose-debug</gschemaname>
+      <gschematype>b</gschematype>
+      <gconfkey>verbose_debug</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>format-dtaus</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>format_dtaus</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>format-csv</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>format_csv</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>format-swift-mt940</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>format_swift_mt940</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>format-swift-mt942</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>format_swift_mt942</gconfkey>
+    </pref>
+    <pref>
+      <gschemaname>last-path</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>last_path</gconfkey>
+    </pref>
+  </prefsgroup>
diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am
index 62d5420988..eeb77070c1 100644
--- a/src/import-export/ofx/Makefile.am
+++ b/src/import-export/ofx/Makefile.am
@@ -44,6 +44,6 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-ofx-ui.xml
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(ui_DATA) migratable-prefs-ofx.xml
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"
diff --git a/src/import-export/ofx/migratable-prefs-ofx.xml b/src/import-export/ofx/migratable-prefs-ofx.xml
new file mode 100644
index 0000000000..39f89b289b
--- /dev/null
+++ b/src/import-export/ofx/migratable-prefs-ofx.xml
@@ -0,0 +1,10 @@
+  <prefsgroup>
+    <gschemaid>org.gnucash.dialogs.import.ofx</gschemaid>
+    <gconfpath>dialogs-import-ofx.xml</gconfpath>
+    
+    <pref>
+      <gschemaname>last-path</gschemaname>
+      <gschematype>s</gschematype>
+      <gconfkey>last_path</gconfkey>
+    </pref>
+  </prefsgroup>