Move the MT940 importer action from the mt940 into the hbci plugin because in

the hbci plugin everything is already there. From now on, MT940
importing is available as soon as --enable-hbci is switched
on. The mt940 plugin can be removed from SVN now.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14841 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-09-13 14:22:54 +00:00
parent 5331629e4c
commit b51a9207dd
6 changed files with 25 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2006-09-13 Christian Stimming <stimming@tuhh.de>
* src/import-export/hbci/gnc-plugin-hbci.c: Move the MT940
importer action from the mt940 into the hbci plugin because in the
hbci plugin everything is already there. From now on, MT940
importing is available as soon as --enable-hbci is switched
on. The mt940 plugin can be removed from SVN now.
2006-09-07 Christian Stimming <stimming@tuhh.de>
* src/engine/gnc-path.h, gnc-path.c: Add new file with utility

View File

@ -358,7 +358,6 @@ load_gnucash_modules()
{ "gnucash/register/register-gnome", 0, FALSE },
{ "gnucash/import-export/qif-import", 0, FALSE },
{ "gnucash/import-export/ofx", 0, TRUE },
{ "gnucash/import-export/mt940", 0, TRUE },
{ "gnucash/import-export/log-replay", 0, TRUE },
{ "gnucash/import-export/hbci", 0, TRUE },
{ "gnucash/report/report-system", 0, FALSE },

View File

@ -3,6 +3,7 @@
<menu name="File" action="FileAction">
<menu name="FileImport" action="FileImportAction">
<placeholder name="FileImportPlaceholder">
<menuitem name="FileMt940Import" action="Mt940ImportAction"/>
<menuitem name="FileDtausImport" action="DtausImportAction"/>
</placeholder>
</menu>

View File

@ -76,6 +76,7 @@ static void gnc_plugin_hbci_cmd_issue_transaction (GtkAction *action, GncMainWin
static void gnc_plugin_hbci_cmd_issue_inttransaction (GtkAction *action, GncMainWindowActionData *data);
#endif
static void gnc_plugin_hbci_cmd_issue_direct_debit (GtkAction *action, GncMainWindowActionData *data);
static void gnc_plugin_hbci_cmd_mt940_import (GtkAction *action, GncMainWindowActionData *data);
static void gnc_plugin_hbci_cmd_dtaus_import (GtkAction *action, GncMainWindowActionData *data);
@ -114,6 +115,9 @@ static GtkActionEntry gnc_plugin_actions [] = {
G_CALLBACK (gnc_plugin_hbci_cmd_issue_direct_debit) },
/* File -> Import menu item */
{ "Mt940ImportAction", GTK_STOCK_CONVERT, N_("Import MT940"), NULL,
N_("Import a MT940 file into GnuCash"),
G_CALLBACK (gnc_plugin_hbci_cmd_mt940_import) },
{ "DtausImportAction", GTK_STOCK_CONVERT, N_("Import DTAUS and _send..."), NULL,
N_("Import a DTAUS file into GnuCash and send the transfers online through HBCI/AqBanking"),
G_CALLBACK (gnc_plugin_hbci_cmd_dtaus_import) },
@ -525,6 +529,13 @@ gnc_plugin_hbci_cmd_dtaus_import (GtkAction *action,
{
gnc_file_aqbanking_import ("dtaus", "default", TRUE);
}
static void
gnc_plugin_hbci_cmd_mt940_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_aqbanking_import ("swift", "swift-mt940", FALSE);
}
/************************************************************
* Plugin Bootstrapping *
************************************************************/

View File

@ -3,7 +3,6 @@
<menu name="File" action="FileAction">
<menu name="FileImport" action="FileImportAction">
<placeholder name="FileImportPlaceholder">
<menuitem name="FileMt940Import" action="Mt940ImportAction"/>
</placeholder>
</menu>
</menu>

View File

@ -37,16 +37,16 @@ static void gnc_plugin_mt940_init (GncPluginMt940 *plugin);
static void gnc_plugin_mt940_finalize (GObject *object);
/* Command callbacks */
static void gnc_plugin_mt940_cmd_import (GtkAction *action, GncMainWindowActionData *data);
/* static void gnc_plugin_mt940_cmd_import (GtkAction *action, GncMainWindowActionData *data); */
#define PLUGIN_ACTIONS_NAME "gnc-plugin-mt940-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-mt940-ui.xml"
static GtkActionEntry gnc_plugin_actions [] = {
{ "Mt940ImportAction", GTK_STOCK_CONVERT, N_("Import MT940"), NULL,
/* { "Mt940ImportAction", GTK_STOCK_CONVERT, N_("Import MT940"), NULL,
N_("Process an MT940 response file"),
G_CALLBACK (gnc_plugin_mt940_cmd_import) },
G_CALLBACK (gnc_plugin_mt940_cmd_import) }, */
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
@ -140,14 +140,14 @@ gnc_plugin_mt940_finalize (GObject *object)
/************************************************************
* Command Callbacks *
************************************************************/
/*
static void
gnc_plugin_mt940_cmd_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_mt940_import ("swift", "swift-mt940");
}
*/
/************************************************************
* Plugin Bootstrapping *