diff --git a/configure.in b/configure.in index 3882ff121c..8d92a64219 100644 --- a/configure.in +++ b/configure.in @@ -2232,8 +2232,6 @@ AC_CONFIG_FILES(po/Makefile.in src/gnome-search/Makefile src/import-export/Makefile src/import-export/test/Makefile - src/import-export/binary-import/Makefile - src/import-export/binary-import/test/Makefile src/import-export/qif-import/Makefile src/import-export/qif/Makefile src/import-export/qif/test/Makefile diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 70a1c5dc6c..cd00ea13e2 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -7,3 +7,7 @@ src/backend/dwi/qofmap.c src/gnome-utils/gnc-tree-model-selection.c src/backend/file/gncmod-backend-file.c src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in +src/backend/file/io-gncbin-r.c +src/import-export/binary-import/binary-import.glade +src/import-export/binary-import/druid-commodity.c +src/import-export/binary-import/gncmod-binary-import.c diff --git a/src/backend/file/Makefile.am b/src/backend/file/Makefile.am index b72b8df8c4..7ad4e6929a 100644 --- a/src/backend/file/Makefile.am +++ b/src/backend/file/Makefile.am @@ -27,7 +27,6 @@ libgnc_backend_file_utils_la_SOURCES = \ gnc-schedxaction-xml-v2.c \ gnc-transaction-xml-v2.c \ io-example-account.c \ - io-gncbin-r.c \ io-gncxml-gen.c \ io-gncxml-v1.c \ io-gncxml-v2.c \ @@ -47,7 +46,6 @@ noinst_HEADERS = \ gnc-xml.h \ gnc-xml-helper.h \ io-example-account.h \ - io-gncbin.h \ io-gncxml-gen.h \ io-gncxml.h \ io-gncxml-v2.h \ diff --git a/src/backend/file/gnc-backend-file.c b/src/backend/file/gnc-backend-file.c index ad1b1a9825..b094c87cec 100644 --- a/src/backend/file/gnc-backend-file.c +++ b/src/backend/file/gnc-backend-file.c @@ -52,7 +52,6 @@ #include "gnc-filepath-utils.h" #include "io-gncxml.h" -#include "io-gncbin.h" #include "io-gncxml-v2.h" #include "gnc-backend-file.h" #include "gnc-gconf-utils.h" @@ -403,8 +402,6 @@ gnc_file_be_determine_file_type(const char *path) } } else if (gnc_is_xml_data_file(path)) { return GNC_BOOK_XML1_FILE; - } else if (gnc_is_bin_file(path)) { - return GNC_BOOK_BIN_FILE; } return GNC_BOOK_NOT_OURS; } @@ -426,7 +423,6 @@ gnc_determine_file_type (const char *path) if (sbuf.st_size == 0) { PINFO (" empty file"); return TRUE; } if(gnc_is_xml_data_file_v2(path, NULL)) { return TRUE; } else if(gnc_is_xml_data_file(path)) { return TRUE; } - else if(gnc_is_bin_file(path)) { return TRUE; } PINFO (" %s is not a gnc file", path); return FALSE; } @@ -868,10 +864,6 @@ gnc_file_be_load_from_file (QofBackend *bend, QofBook *book) rc = qof_session_load_from_xml_file (book, be->fullpath); if (FALSE == rc) error = ERR_FILEIO_PARSE_ERROR; break; - case GNC_BOOK_BIN_FILE: - qof_session_load_from_binfile(book, be->fullpath); - error = gnc_get_binfile_io_error(); - break; default: PWARN("File not any known type"); error = ERR_FILEIO_UNKNOWN_FILE_TYPE; diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c index e80a5705b0..2b62e4b90e 100644 --- a/src/bin/gnucash-bin.c +++ b/src/bin/gnucash-bin.c @@ -350,7 +350,6 @@ load_gnucash_modules() { "gnucash/register/ledger-core", 0, FALSE }, { "gnucash/register/register-core", 0, FALSE }, { "gnucash/register/register-gnome", 0, FALSE }, - { "gnucash/import-export/binary-import", 0, FALSE }, { "gnucash/import-export/qif-import", 0, FALSE }, { "gnucash/import-export/ofx", 0, TRUE }, { "gnucash/import-export/mt940", 0, TRUE }, diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 05ad0ff49a..78dc19b7f5 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -1,5 +1,7 @@ -SUBDIRS = . schemas binary-import qif qif-import ${OFX_DIR} ${HBCI_DIR} ${MT940_DIR} log-replay test -DIST_SUBDIRS = schemas binary-import qif qif-import qif-io-core ofx hbci mt940 log-replay test +SUBDIRS = . schemas qif qif-import \ + ${OFX_DIR} ${HBCI_DIR} ${MT940_DIR} log-replay test +DIST_SUBDIRS = schemas qif qif-import qif-io-core \ + ofx hbci mt940 log-replay test pkglib_LTLIBRARIES=libgncmod-generic-import.la