r23259 - gnucash/trunk/src - Remove unused gconf includes, cflags and libs so far
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:27:03 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:27:02 -0400 (Mon, 07 Oct 2013)
New Revision: 23259
Trac: http://svn.gnucash.org/trac/changeset/23259
Removed:
gnucash/trunk/src/bin/update-gnucash-gconf.in
gnucash/trunk/src/business/business-gnome/schemas/Makefile.am
gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in
gnucash/trunk/src/import-export/schemas/Makefile.am
gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in
Modified:
gnucash/trunk/src/app-utils/gnc-prefs-utils.c
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/business-ledger/Makefile.am
gnucash/trunk/src/gnome-search/Makefile.am
gnucash/trunk/src/gnome-utils/gnc-autosave.c
gnucash/trunk/src/gnome-utils/gnc-gobject-utils.c
gnucash/trunk/src/gnome-utils/gnc-gui-query.c
gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
gnucash/trunk/src/gnome-utils/gnc-tree-control-split-reg.c
gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-price.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c
gnucash/trunk/src/gnome-utils/print-session.c
gnucash/trunk/src/gnome/reconcile-view.h
gnucash/trunk/src/gnome/top-level.c
gnucash/trunk/src/gnome/window-autoclear.c
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/optional/gtkmm/Makefile.am
gnucash/trunk/src/plugins/bi_import/Makefile.am
gnucash/trunk/src/plugins/customer_import/Makefile.am
gnucash/trunk/src/register/ledger-core/Makefile.am
gnucash/trunk/src/register/register-gnome/gnucash-style.c
Log:
Remove unused gconf includes, cflags and libs so far
This reduces the cruft a bit, making it easier
to see what's still to be migrated
Modified: gnucash/trunk/src/app-utils/gnc-prefs-utils.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-prefs-utils.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/app-utils/gnc-prefs-utils.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -23,7 +23,6 @@
#include "config.h"
-#include "gnc-gconf-utils.h"
#include "gnc-gsettings.h"
#include "gnc-prefs-utils.h"
#include "gnc-prefs.h"
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/bin/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -5,7 +5,7 @@
SUBDIRS = . test
endif
-AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GCONF_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
+AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
-DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
-DPKGDATADIR=\"${GNC_SHAREDIR}\" \
-I${top_srcdir}/src \
@@ -71,7 +71,6 @@
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GLIB_LIBS} \
- ${GCONF_LIBS} \
${GTK_LIBS}
GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
@@ -154,7 +153,6 @@
bin_SCRIPTS = \
${gnc_common_scripts} \
- update-gnucash-gconf \
${PLATFORM_FILES}
# if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
@@ -164,25 +162,12 @@
${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
-CLEANFILES += ${gnc_common_scripts} update-gnucash-gconf
+CLEANFILES += ${gnc_common_scripts}
-## We borrow guile's convention and use @-...-@ as the substitution
-## brackets here, instead of the usual @... at . This prevents autoconf
-## from substituting the values directly into the left-hand sides of
-## the sed substitutions.
-update-gnucash-gconf: update-gnucash-gconf.in \
- ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's#@-GCONF_SCHEMA_FILE_DIR-@#${GCONF_SCHEMA_FILE_DIR}#g'
- mv $@.tmp $@
- chmod +x $@
-
endif
EXTRA_DIST = \
generate-gnc-script \
- update-gnucash-gconf.in \
gnucash-launcher.in \
gnucash-valgrind.in \
gnucash-gdb.in \
Deleted: gnucash/trunk/src/bin/update-gnucash-gconf.in
===================================================================
--- gnucash/trunk/src/bin/update-gnucash-gconf.in 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/bin/update-gnucash-gconf.in 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-SCHEMA_INSTALL_DIR="@-GCONF_SCHEMA_FILE_DIR-@"
-
-cd ${SCHEMA_INSTALL_DIR}
-for file in *.schemas; do
- gconftool-2 --config-source=xml::${HOME}/.gconf --install-schema-file $file;
-done
-gconftool-2 --shutdown
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,4 +1,4 @@
-SUBDIRS = . gtkbuilder schemas gschemas ui
+SUBDIRS = . gtkbuilder gschemas ui
pkglib_LTLIBRARIES = libgncmod-business-gnome.la
@@ -20,7 +20,6 @@
-I${top_srcdir}/src/register/ledger-core \
-I${top_srcdir}/src/libqof/qof \
${GTK_CFLAGS} \
- ${GCONF_CFLAGS} \
${GLIB_CFLAGS} \
${GUILE_INCS}
@@ -80,7 +79,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GTK_LIBS} \
- ${GCONF_LIBS} \
${GUILE_LIBS} \
${GLIB_LIBS} \
${EFENCE_LIBS}
Deleted: gnucash/trunk/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/schemas/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/business/business-gnome/schemas/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = \
- apps_gnucash_dialog_business_common.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/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in
===================================================================
--- gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/search_for_active_only</key>
- <applyto>/apps/gnucash/dialogs/business/customer_search/search_for_active_only</applyto>
- <applyto>/apps/gnucash/dialogs/business/employee_search/search_for_active_only</applyto>
- <applyto>/apps/gnucash/dialogs/business/invoice_search/search_for_active_only</applyto>
- <applyto>/apps/gnucash/dialogs/business/job_search/search_for_active_only</applyto>
- <applyto>/apps/gnucash/dialogs/business/order_search/search_for_active_only</applyto>
- <applyto>/apps/gnucash/dialogs/business/vendor_search/search_for_active_only</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <locale name="C">
- <short>Search only in active items</short>
- <long>
- If active, only the 'active' items in the current class will
- be searched. Otherwise all items in the current class will
- be searched.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/invoice/enable_toolbuttons</key>
- <applyto>/apps/gnucash/dialogs/business/invoice/enable_toolbuttons</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Enable extra toolbar buttons for business</short>
- <long>
- If active, extra toolbar buttons for common business
- functions are shown as well. Otherwise they are not shown.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/invoice/invoice_printreport</key>
- <applyto>/apps/gnucash/dialogs/business/invoice/invoice_printreport</applyto>
- <owner>gnucash</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short>The invoice report to be used for printing</short>
- <long>
- The name of the report to be used for invoice printing.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/invoice/use_new_window</key>
- <applyto>/apps/gnucash/dialogs/business/invoice/use_new_window</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Open new invoice in new window</short>
- <long>
- If active, each new invoice will be opened in a new
- window. Otherwise a new invoice will be opened as a tab in
- the main window.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/invoice/accumulate_splits</key>
- <applyto>/apps/gnucash/dialogs/business/invoice/accumulate_splits</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Accumulate multiple splits into one</short>
- <long>
- If this field is active then multiple entries in an invoice
- that transfer to the same account will be accumulated into a
- single split. This field can be overridden per invoice in
- the Posting dialog.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/tax_included</key>
- <applyto>/apps/gnucash/dialogs/business/bill/tax_included</applyto>
- <applyto>/apps/gnucash/dialogs/business/invoice/tax_included</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Is tax included in this type of business entry?</short>
- <long>
- If set to active then tax is included by default in entries of
- this type. This setting is inherited by new customers and
- vendors.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/bill/notify_when_due</key>
- <applyto>/apps/gnucash/dialogs/business/bill/notify_when_due</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Show bills due reminder at startup</short>
- <long>
- If active, at startup GnuCash will check to see whether any
- bills will become due soon. If so, it will present the user
- with a reminder dialog. The definition of "soon" is
- controlled by the "Days in Advance" setting. Otherwise
- GnuCash does not check for due bills.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/business/bill/days_in_advance</key>
- <applyto>/apps/gnucash/dialogs/business/bill/days_in_advance</applyto>
- <owner>gnucash</owner>
- <type>float</type>
- <default>7.0</default>
- <locale name="C">
- <short>Show bills due within this many days</short>
- <long>
- This field defines the number of days in advance that
- GnuCash will check for due bills. Its value is only used if
- the "Notify when due" setting is active.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -37,7 +37,6 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/libqof/qof \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/gnome/reconcile-view.h
===================================================================
--- gnucash/trunk/src/gnome/reconcile-view.h 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome/reconcile-view.h 2013-10-07 14:27:02 UTC (rev 23259)
@@ -68,7 +68,6 @@
void (*double_click_split) (GNCReconcileView *view, Split *split);
} GNCReconcileViewClass;
-#define GCONF_RECONCILE_SECTION "dialogs/reconcile"
#define GNC_PREFS_GROUP_RECONCILE "dialogs.reconcile"
/***********************************************************
Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome/top-level.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -40,7 +40,6 @@
#include "file-utils.h"
#include "gnc-component-manager.h"
#include "gnc-engine.h"
-#include "gnc-gconf-utils.h"
#include "gnc-file.h"
#include "gnc-hooks.h"
#include "gfec.h"
Modified: gnucash/trunk/src/gnome/window-autoclear.c
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome/window-autoclear.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -34,7 +34,6 @@
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
#include "gnc-event.h"
-#include "gnc-gconf-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-main-window.h"
#include "gnc-plugin-page-register.h"
Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-search/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -9,7 +9,6 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS}
@@ -54,7 +53,6 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
- ${GCONF_LIBS} \
${GLIB_LIBS} \
${REGEX_LIBS}
Modified: gnucash/trunk/src/gnome-utils/gnc-autosave.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-autosave.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-autosave.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -31,7 +31,6 @@
#include "gnc-ui.h"
#include "gnc-file.h"
#include "gnc-window.h"
-#include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-main-window.h"
#include "gnc-gui-query.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-gobject-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gobject-utils.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-gobject-utils.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -33,7 +33,7 @@
static void gnc_gobject_weak_cb (gpointer user_data, GObject *object);
/************************************************************/
-/* Gconf Utilities */
+/* GObject Utilities */
/************************************************************/
Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -25,7 +25,6 @@
#include <glib/gi18n.h>
#include "dialog-utils.h"
-#include "gnc-gconf-utils.h"
#include "qof.h"
#include "gnc-gui-query.h"
#include "gnc-ui.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -44,7 +44,6 @@
#include "gnc-main-window.h"
#include "gnc-plugin-menu-additions.h"
#include "gnc-window.h"
-#include "gnc-gconf-utils.h"
#include "gnc-ui.h"
#include "gnc-menu-extensions.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-control-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-control-split-reg.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-control-split-reg.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -37,7 +37,6 @@
#include "gnc-tree-view-split-reg.h"
#include "gnc-component-manager.h"
#include "gnc-ui.h"
-#include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-gdate-utils.h"
#include "dialog-utils.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-owner.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -32,7 +32,6 @@
#include "gnc-component-manager.h"
#include "gncOwner.h"
#include "gnc-commodity.h"
-#include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "gnc-engine.h"
#include "gnc-event.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-commodity.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -35,7 +35,6 @@
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
#include "gnc-engine.h"
-#include "gnc-gconf-utils.h"
#include "gnc-glib-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-icons.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-price.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-price.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-price.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -35,7 +35,6 @@
#include "gnc-pricedb.h"
#include "gnc-component-manager.h"
#include "gnc-engine.h"
-#include "gnc-gconf-utils.h"
#include "gnc-glib-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-icons.h"
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-sx-list.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -41,7 +41,6 @@
#include "gnc-tree-view.h"
#include "gnc-tree-view-sx-list.h"
#include "gnc-sx-list-tree-model-adapter.h"
-#include "gnc-gconf-utils.h"
#define LOG_MOD "gnc.ui.tree-view.sx-list"
static QofLogModule log_module = LOG_MOD;
Modified: gnucash/trunk/src/gnome-utils/print-session.c
===================================================================
--- gnucash/trunk/src/gnome-utils/print-session.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/gnome-utils/print-session.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -25,7 +25,6 @@
#include <gtk/gtk.h>
#include "print-session.h"
-#include "gnc-gconf-utils.h" /* for gnc_gconf_set_string() */
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gnc.printing"
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/import-export/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -4,7 +4,7 @@
if WITH_AQBANKING
AQBANKING_DIR=aqbanking
endif
-SUBDIRS = . schemas gschemas qif qif-import \
+SUBDIRS = . gschemas qif qif-import \
${OFX_DIR} ${AQBANKING_DIR} log-replay test csv-import csv-export
pkglib_LTLIBRARIES=libgncmod-generic-import.la
@@ -46,7 +46,6 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GCONF_LIBS} \
${REGEX_LIBS} \
${GLIB_LIBS}
@@ -62,7 +61,6 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/libqof/qof \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS}
Deleted: gnucash/trunk/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/schemas/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/import-export/schemas/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = \
- apps_gnucash_import_generic_matcher.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/schemas/apps_gnucash_import_generic_matcher.schemas.in
===================================================================
--- gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in 2013-10-07 14:27:02 UTC (rev 23259)
@@ -1,223 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_skip</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_skip</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Enable SKIP transaction action</short>
- <long>
- Enable the SKIP action in the transaction matcher. If
- enabled, a transaction whose best match's score is in the
- yellow zone (above the Auto-ADD threshold but below the
- Auto-CLEAR threshold) will be skipped by default.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/enable_update</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/enable_update</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Enable UPDATE match action</short>
- <long>
- Enable the UPDATE AND RECONCILE action in the transaction matcher.
- If enabled, a transaction whose best match's score is above the
- Auto-CLEAR threshold and has a different date or amount than the
- matching existing transaction will cause the existing transaction
- to be updated and cleared by default.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/use_bayes</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/use_bayes</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Use bayesian matching</short>
- <long>Enables bayesian matching when matching imported
- transaction against existing transactions. Otherwise a less
- sophisticated rule-based matching mechanism will be
- used.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/match_threshold</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/match_threshold</applyto>
- <owner>gnucash</owner>
- <type>float</type>
- <default>1.0</default>
- <locale name="C">
- <short>Minimum score to be displayed</short>
- <long>
- This field specifies the minimum matching score a potential
- matching transaction must have to be displayed in the match
- list.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_add_threshold</applyto>
- <owner>gnucash</owner>
- <type>float</type>
- <default>3.0</default>
- <locale name="C">
- <short>Add matching transactions below this score</short>
- <long>
- This field specifies the threshold below which a matching
- transaction will be added automatically. A transaction whose
- best match's score is in the red zone (above the display
- minimum score but below or equal to the Add match score)
- will be added to the GnuCash file by default.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_clear_threshold</applyto>
- <owner>gnucash</owner>
- <type>float</type>
- <default>6.0</default>
- <locale name="C">
- <short>Clear matching transactions above this score</short>
- <long>
- This field specifies the threshold above which a matching
- transaction will be cleared by default. A transaction whose
- best match's score is in the green zone (above or equal to
- this Clear threshold) will be cleared by default.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/atm_fee_threshold</applyto>
- <owner>gnucash</owner>
- <type>float</type>
- <default>2.0</default>
- <locale name="C">
- <short>Maximum ATM fee amount in your area</short>
- <long>
- This field specifies the extra fee that is taken into
- account when matching imported transactions. In some places
- commercial ATMs (not belonging to a financial institution)
- are installed in places like convenience stores. These ATMs
- add their fee directly to the amount instead of showing up as
- a separate transaction or in your monthly banking fees. For
- example, you withdraw $100, and you are charged $101,50 plus
- Interac fees. If you manually entered that $100, the
- amounts won't match. You should set this to whatever is the
- maximum such fee in your area (in units of your local
- currency), so the transaction will be recognised as a match.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/dialogs/import/generic_matcher/auto_create_commodity</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/auto_create_commodity</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Automatically create new commodities</short>
- <long>Enables the automatic creation of new commodities if any
- unknown commodity is encountered during import. Otherwise
- the user will be asked what to do with each unknown
- commodity.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/window/pages/visibility</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/account-code_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/account-color_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance-period_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/cleared_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/cleared_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/commodity_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/description_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/future_min_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/future_min_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/lastnum_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/last-recon-date_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/name_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/notes_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/online_id_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/placeholder_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/present_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/present_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/reconciled_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/reconciled_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/tax-info_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total-period_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total_report_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total_visible</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/type_visible</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <locale name="C">
- <short>Whether or not to display this column</short>
- <long>
- This setting controls wether the given column will be visible in the
- view. True means visible, false means hidden.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/gnucash/window/pages/width</key>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/account-code_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/account-color_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance-period_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/balance_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/cleared_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/cleared_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/commodity_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/description_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/future_min_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/future_min_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/lastnum_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/last-recon-date_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/name_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/notes_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/online_id_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/placeholder_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/present_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/present_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/reconciled_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/reconciled_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/tax-info_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total-period_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total_report_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/total_width</applyto>
- <applyto>/apps/gnucash/dialogs/import/generic_matcher/account_matcher/type_width</applyto>
- <owner>gnucash</owner>
- <type>int</type>
- <locale name="C">
- <short>Width of this column</short>
- <long>
- This setting stores the width of the given column in pixels.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
Modified: gnucash/trunk/src/optional/gtkmm/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/gtkmm/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/optional/gtkmm/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -42,7 +42,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GTKMM_LIBS} \
- ${GCONF_LIBS} \
${GLIB_LIBS}
AM_CPPFLAGS = \
@@ -52,7 +51,6 @@
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
${GTKMM_CFLAGS} \
- ${GCONF_CFLAGS} \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
Modified: gnucash/trunk/src/plugins/bi_import/Makefile.am
===================================================================
--- gnucash/trunk/src/plugins/bi_import/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/plugins/bi_import/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -26,7 +26,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/lib/libc/libc-missing.la \
- ${GCONF_LIBS} \
${QOF_LIBS} \
${GLIB_LIBS}
@@ -48,7 +47,6 @@
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/lib/libc \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/plugins/customer_import/Makefile.am
===================================================================
--- gnucash/trunk/src/plugins/customer_import/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/plugins/customer_import/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -24,7 +24,6 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${top_builddir}/lib/libc/libc-missing.la \
- ${GCONF_LIBS} \
${QOF_LIBS} \
${GLIB_LIBS}
@@ -46,7 +45,6 @@
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/lib/libc \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am 2013-10-07 14:27:02 UTC (rev 23259)
@@ -35,7 +35,6 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
- ${GCONF_LIBS} \
${GUILE_LIBS} \
${GTK_LIBS} \
${GLIB_LIBS}
@@ -51,7 +50,6 @@
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
- ${GCONF_CFLAGS} \
${GTK_CFLAGS} \
${GLIB_CFLAGS} \
${GNOME_CFLAGS}
Modified: gnucash/trunk/src/register/register-gnome/gnucash-style.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-style.c 2013-10-07 14:26:11 UTC (rev 23258)
+++ gnucash/trunk/src/register/register-gnome/gnucash-style.c 2013-10-07 14:27:02 UTC (rev 23259)
@@ -29,7 +29,6 @@
#include "gnucash-sheet.h"
#include "gnucash-sheetP.h"
#include "gnucash-style.h"
-#include "gnc-gconf-utils.h"
#include "gnc-engine.h" // For debugging, e.g. ENTER(), LEAVE()
/** GLOBALS *********************************************************/
More information about the gnucash-changes
mailing list