r23255 - gnucash/trunk - Gnc-Prefs: cleanup (most) gconf wiring in import-export
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:22:55 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:22:52 -0400 (Mon, 07 Oct 2013)
New Revision: 23255
Trac: http://svn.gnucash.org/trac/changeset/23255
Removed:
gnucash/trunk/src/import-export/aqbanking/schemas/Makefile.am
gnucash/trunk/src/import-export/aqbanking/schemas/apps_gnucash_dialog_hbci.schemas.in
gnucash/trunk/src/import-export/csv-export/schemas/Makefile.am
gnucash/trunk/src/import-export/csv-export/schemas/apps_gnucash_dialog_export_csv.schemas.in
gnucash/trunk/src/import-export/qif-import/schemas/Makefile.am
gnucash/trunk/src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in
Modified:
gnucash/trunk/configure.ac
gnucash/trunk/src/import-export/aqbanking/Makefile.am
gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
gnucash/trunk/src/import-export/aqbanking/gnc-plugin-aqbanking.c
gnucash/trunk/src/import-export/csv-export/Makefile.am
gnucash/trunk/src/import-export/csv-import/Makefile.am
gnucash/trunk/src/import-export/log-replay/Makefile.am
gnucash/trunk/src/import-export/ofx/Makefile.am
gnucash/trunk/src/import-export/qif-import/Makefile.am
Log:
Gnc-Prefs: cleanup (most) gconf wiring in import-export
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/configure.ac 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1336,7 +1336,6 @@
src/import-export/qif/Makefile
src/import-export/qif/test/Makefile
src/import-export/qif-import/gschemas/Makefile
- src/import-export/qif-import/schemas/Makefile
src/import-export/qif-import/test/Makefile
src/import-export/gschemas/Makefile
src/import-export/schemas/Makefile
@@ -1346,11 +1345,9 @@
src/import-export/csv-import/gschemas/Makefile
src/import-export/csv-export/Makefile
src/import-export/csv-export/gschemas/Makefile
- src/import-export/csv-export/schemas/Makefile
src/import-export/log-replay/Makefile
src/import-export/aqbanking/Makefile
src/import-export/aqbanking/gschemas/Makefile
- src/import-export/aqbanking/schemas/Makefile
src/libqof/Makefile
src/libqof/qof/Makefile
src/libqof/qof/test/Makefile
Modified: gnucash/trunk/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/aqbanking/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,4 +1,4 @@
-SUBDIRS = . schemas gschemas
+SUBDIRS = . gschemas
pkglib_LTLIBRARIES = libgncmod-aqbanking.la
@@ -45,7 +45,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GTK_LIBS} \
- ${GCONF_LIBS} \
${GLIB_LIBS} \
${GWENGUI_GTK2_LIBS} \
${AQBANKING_LIBS}
@@ -64,7 +63,6 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/libqof/qof \
${GTK_CFLAGS} \
- ${GCONF_CFLAGS} \
${GLIB_CFLAGS} \
${AQBANKING_CFLAGS}
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.h 2013-10-07 14:22:52 UTC (rev 23255)
@@ -70,11 +70,10 @@
# define AQBANKING_VERSION_4_EXACTLY
#endif
-#define GCONF_SECTION_AQBANKING "dialogs/import/hbci"
#define GNC_PREFS_GROUP_AQBANKING "dialogs.import.hbci"
-#define KEY_FORMAT_SWIFT940 "format_swift_mt940"
-#define KEY_FORMAT_SWIFT942 "format_swift_mt942"
-#define KEY_FORMAT_DTAUS "format_dtaus"
+#define GNC_PREF_FORMAT_SWIFT940 "format_swift_mt940"
+#define GNC_PREF_FORMAT_SWIFT942 "format_swift_mt942"
+#define GNC_PREF_FORMAT_DTAUS "format_dtaus"
#define GNC_PREF_VERBOSE_DEBUG "verbose_debug"
typedef struct _GncABImExContextImport GncABImExContextImport;
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-plugin-aqbanking.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-plugin-aqbanking.c 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-plugin-aqbanking.c 2013-10-07 14:22:52 UTC (rev 23255)
@@ -42,13 +42,13 @@
#include "gnc-ab-kvp.h"
#include "gnc-gwen-gui.h"
#include "gnc-file-aqb-import.h"
-#include "gnc-gconf-utils.h"
#include "gnc-plugin-aqbanking.h"
#include "gnc-plugin-manager.h"
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
#include "gnc-plugin-page-register2.h"
#include "gnc-main-window.h"
+#include "gnc-prefs.h"
#include "gnc-ui-util.h" // for gnc_get_current_book
/* This static indicates the debugging module that this .o belongs to. */
@@ -661,8 +661,8 @@
static void
gnc_plugin_ab_cmd_mt940_import(GtkAction *action, GncMainWindowActionData *data)
{
- gchar *format = gnc_gconf_get_string(GCONF_SECTION_AQBANKING,
- KEY_FORMAT_SWIFT940, NULL);
+ gchar *format = gnc_prefs_get_string(GNC_PREFS_GROUP_AQBANKING,
+ GNC_PREF_FORMAT_SWIFT940);
gnc_main_window = data->window;
gnc_file_aqbanking_import("swift", format ? format : "swift-mt940", FALSE);
g_free(format);
@@ -671,8 +671,8 @@
static void
gnc_plugin_ab_cmd_mt942_import(GtkAction *action, GncMainWindowActionData *data)
{
- gchar *format = gnc_gconf_get_string(GCONF_SECTION_AQBANKING,
- KEY_FORMAT_SWIFT942, NULL);
+ gchar *format = gnc_prefs_get_string(GNC_PREFS_GROUP_AQBANKING,
+ GNC_PREF_FORMAT_SWIFT942);
gnc_main_window = data->window;
gnc_file_aqbanking_import("swift", format ? format : "swift-mt942", FALSE);
g_free(format);
@@ -681,8 +681,8 @@
static void
gnc_plugin_ab_cmd_dtaus_import(GtkAction *action, GncMainWindowActionData *data)
{
- gchar *format = gnc_gconf_get_string(GCONF_SECTION_AQBANKING,
- KEY_FORMAT_DTAUS, NULL);
+ gchar *format = gnc_prefs_get_string(GNC_PREFS_GROUP_AQBANKING,
+ GNC_PREF_FORMAT_DTAUS);
gnc_main_window = data->window;
gnc_file_aqbanking_import("dtaus", format ? format : "default", FALSE);
g_free(format);
@@ -692,8 +692,8 @@
gnc_plugin_ab_cmd_dtaus_importsend(GtkAction *action,
GncMainWindowActionData *data)
{
- gchar *format = gnc_gconf_get_string(GCONF_SECTION_AQBANKING,
- KEY_FORMAT_DTAUS, NULL);
+ gchar *format = gnc_prefs_get_string(GNC_PREFS_GROUP_AQBANKING,
+ GNC_PREF_FORMAT_DTAUS);
gnc_main_window = data->window;
gnc_file_aqbanking_import("dtaus", format ? format : "default", TRUE);
g_free(format);
Deleted: gnucash/trunk/src/import-export/aqbanking/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/schemas/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/aqbanking/schemas/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = \
- apps_gnucash_dialog_hbci.schemas.in
-schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
- at INTLTOOL_SCHEMAS_RULE@
-
-EXTRA_DIST = $(schemas_in_files)
-
-CLEANFILES = $(schema_DATA)
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
- -mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
Deleted: gnucash/trunk/src/import-export/aqbanking/schemas/apps_gnucash_dialog_hbci.schemas.in
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/schemas/apps_gnucash_dialog_hbci.schemas.in 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/aqbanking/schemas/apps_gnucash_dialog_hbci.schemas.in 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,114 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/close_on_finish</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/close_on_finish</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>True</default>
- <locale name="C">
- <short>Close window when finished</short>
- <long>
- If active, the window will be closed automatically when you
- finish the HBCI/AqBanking import process. Otherwise it will
- stay open.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/remember_pin</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/remember_pin</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>False</default>
- <locale name="C">
- <short>Remember the PIN in memory</short>
- <long>If active, the PIN for HBCI/AqBanking actions will be
- remembered in memory during a session. Otherwise it will have
- to be entered again each time during a session when it is
- needed.</long>
- </locale>
- </schema>
-
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/verbose_debug</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/verbose_debug</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>False</default>
- <locale name="C">
- <short>Verbose HBCI debug messages</short>
- <long>Enables verbose debug messages for HBCI/AqBanking Online Banking.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/format_dtaus</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/format_dtaus</applyto>
- <owner>gnucash</owner>
- <type>string</type>
- <default>default</default>
- <locale name="C">
- <short>DTAUS import data format</short>
- <long>
- This setting specifies the data format when importing DTAUS
- files. The AqBanking library offers various import formats
- (called "profiles") of which you can choose one here.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/format_csv</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/format_csv</applyto>
- <owner>gnucash</owner>
- <type>string</type>
- <default>default</default>
- <locale name="C">
- <short>CSV import data format</short>
- <long>
- This setting specifies the data format when importing CSV
- files. The AqBanking library offers various import formats
- (called "profiles") of which you can choose one here.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/format_swift_mt940</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/format_swift_mt940</applyto>
- <owner>gnucash</owner>
- <type>string</type>
- <default>swift-mt940</default>
- <locale name="C">
- <short>SWIFT MT940 import data format</short>
- <long>
- This setting specifies the data format when importing SWIFT
- MT940 files. The AqBanking library offers various import
- formats (called "profiles") of which you can choose one here.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/hbci/format_swift_mt942</key>
- <applyto>/apps/gnucash/dialogs/import/hbci/format_swift_mt942</applyto>
- <owner>gnucash</owner>
- <type>string</type>
- <default>swift-mt942</default>
- <locale name="C">
- <short>SWIFT MT942 import data format</short>
- <long>
- This setting specifies the data format when importing SWIFT
- MT942 files. The AqBanking library offers various import
- formats (called "profiles") of which you can choose one here.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
Modified: gnucash/trunk/src/import-export/csv-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-export/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/csv-export/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,4 +1,4 @@
-SUBDIRS = . schemas gschemas
+SUBDIRS = . gschemas
pkglib_LTLIBRARIES=libgncmod-csv-export.la
@@ -42,7 +42,6 @@
-I${top_srcdir}/src/libqof/qof \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/lib \
- ${GCONF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
$(GOFFICE_CFLAGS)
Deleted: gnucash/trunk/src/import-export/csv-export/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-export/schemas/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/csv-export/schemas/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = \
- apps_gnucash_dialog_export_csv.schemas.in
-schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
- at INTLTOOL_SCHEMAS_RULE@
-
-EXTRA_DIST = $(schemas_in_files)
-
-CLEANFILES = $(schema_DATA)
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
- -mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
Deleted: gnucash/trunk/src/import-export/csv-export/schemas/apps_gnucash_dialog_export_csv.schemas.in
===================================================================
--- gnucash/trunk/src/import-export/csv-export/schemas/apps_gnucash_dialog_export_csv.schemas.in 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/csv-export/schemas/apps_gnucash_dialog_export_csv.schemas.in 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/export/csv/paned_position</key>
- <applyto>/apps/gnucash/dialogs/export/csv/paned_position</applyto>
- <owner>gnucash</owner>
- <type>int</type>
- <locale name="C">
- <short>Window geometry</short>
- <long>
- The position of paned window when it was last closed.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
Modified: gnucash/trunk/src/import-export/csv-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-import/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/csv-import/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -46,7 +46,6 @@
-I${top_srcdir}/src/libqof/qof \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/lib \
- ${GCONF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
$(GOFFICE_CFLAGS)
Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -34,7 +34,6 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/libqof/qof \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -36,7 +36,6 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/libqof/qof \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS} \
${LIBOFX_CFLAGS}
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,4 +1,4 @@
-SUBDIRS = . test schemas gschemas
+SUBDIRS = . test gschemas
pkglib_LTLIBRARIES=libgncmod-qif-import.la
@@ -25,7 +25,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
- ${GCONF_LIBS} \
${GLIB_LIBS}
@@ -63,8 +62,7 @@
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${GTK_CFLAGS} \
- ${GCONF_CFLAGS}
+ ${GTK_CFLAGS}
uidir = $(GNC_UI_DIR)
ui_DATA = \
Deleted: gnucash/trunk/src/import-export/qif-import/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/schemas/Makefile.am 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/qif-import/schemas/Makefile.am 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = \
- apps_gnucash_import_qif.schemas.in
-schema_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
- at INTLTOOL_SCHEMAS_RULE@
-
-EXTRA_DIST = $(schemas_in_files)
-
-CLEANFILES = $(schema_DATA)
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
- -mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-uninstall-local:
-if GCONF_SCHEMAS_INSTALL
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
Deleted: gnucash/trunk/src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in
===================================================================
--- gnucash/trunk/src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in 2013-10-07 14:22:23 UTC (rev 23254)
+++ gnucash/trunk/src/import-export/qif-import/schemas/apps_gnucash_import_qif.schemas.in 2013-10-07 14:22:52 UTC (rev 23255)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/qif/show_doc</key>
- <applyto>/apps/gnucash/dialogs/import/qif/show_doc</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Show documentation</short>
- <long>
- Show some documentation-only pages in QIF Import assistant.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/qif/default_status</key>
- <applyto>/apps/gnucash/dialogs/import/qif/default_status</applyto>
- <owner>gnucash</owner>
- <type>string</type>
- <default>not_cleared</default>
- <locale name="C">
- <short>Default QIF transaction status</short>
- <long>
- Default status for QIF transaction when not specified in QIF file.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
More information about the gnucash-changes
mailing list