Bug#332802: fix Export Accounts; remove price_lookup and export functions from GncFileBackend.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13417 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled
2006-02-28 02:27:59 +00:00
parent 83aeccb25e
commit d46ad76a70
4 changed files with 16 additions and 22 deletions

View File

@@ -1,5 +1,16 @@
2006-02-27 Joshua Sled <jsled@asynchronous.org>
* src/backend/file/gnc-backend-file.h (struct FileBackend_struct):
Remove unused `pricedb_lookup` and `export` operations from
gnucash-specific file backend.
* src/backend/file/gnc-backend-file.c (gnc_backend_new): Use
correct 'export' function-slot, allowing File > Export > Export
Accounts to work again. Bug#332802.
* src/gnome/gnc-plugin-basic-commands.c: Clarify "Export Accounts"
from "Export Chart of Accounts [to QSF].
* src/calculation/expression_parser.c (primary_exp): Fix infinite
loop in parsing malformed functions (e.g. "ipmt(1:2:)"). Bug#332804.

View File

@@ -898,7 +898,6 @@ libgncmod_backend_file_LTX_gnc_backend_new(void)
fbe->fullpath = NULL;
fbe->lockfile = NULL;
fbe->linkfile = NULL;
fbe->price_lookup = NULL;
fbe->lockfd = -1;
fbe->primary_book = NULL;
@@ -960,7 +959,8 @@ gnc_backend_new(void)
be->load_config = NULL;
be->get_config = NULL;
gnc_be->export = gnc_file_be_write_accounts_to_file;
be->export = gnc_file_be_write_accounts_to_file;
gnc_be->dirname = NULL;
gnc_be->fullpath = NULL;
gnc_be->lockfile = NULL;

View File

@@ -42,23 +42,6 @@ struct FileBackend_struct
char *lockfile;
char *linkfile;
int lockfd;
/** \deprecated
* XXX price_lookup should be removed during the redesign
* of the SQL backend... prices can now be queried using
* the generic query mechanism.
*
* Note the correct signature for this call is
* void (*price_lookup) (QofBackend *, GNCPriceLookup *);
* we use gpointer to avoid an unwanted include file dependency.
*/
void (*price_lookup) (QofBackend *, gpointer);
/**
* XXX Export should really _NOT_ be here, but is left here for now.
* I'm not sure where this should be going to. It should be
* removed ASAP. This is a temporary hack-around until period-closing
* is fully implemented.
*/
void (*export) (QofBackend *, QofBook *);
QofBook *primary_book; /* The primary, main open book */

View File

@@ -109,11 +109,11 @@ static GtkActionEntry gnc_plugin_actions [] = {
G_CALLBACK (gnc_main_window_cmd_file_qsf_import) },
{ "FileExportAccountsAction", GTK_STOCK_CONVERT,
N_("Export _Accounts"), NULL,
N_("Export the account hierarchy to a new file"),
N_("Export the account hierarchy to a new GnuCash datafile"),
G_CALLBACK (gnc_main_window_cmd_file_export_accounts) },
{ "FileExportChartAction", GTK_STOCK_CONVERT,
N_("Export _Chart of Accounts"), NULL,
N_("Export the chart of accounts for a date with balances"),
N_("Export _Chart of Accounts to QSF"), NULL,
N_("Export the chart of accounts for a date with balances as QSF"),
G_CALLBACK (gnc_main_window_cmd_file_chart_export) },
/* Edit menu */