diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c index bf007d8ba8..9a59b9551b 100644 --- a/src/gnome/gnc-plugin-basic-commands.c +++ b/src/gnome/gnc-plugin-basic-commands.c @@ -56,9 +56,7 @@ #include "gnc-session.h" /* This static indicates the debugging module that this .o belongs to. */ -#ifdef QSF_IMPORT_NO_LONGER_BROKEN static QofLogModule log_module = GNC_MOD_GUI; -#endif static void gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass); static void gnc_plugin_basic_commands_init (GncPluginBasicCommands *plugin); @@ -69,13 +67,9 @@ static void gnc_main_window_cmd_file_new (GtkAction *action, GncMainWindowAction static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *data); -#ifdef QSF_IMPORT_NO_LONGER_BROKEN static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data); -#endif static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data); -#ifdef QSF_EXPORT_NO_LONGER_BROKEN static void gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data); -#endif static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindowActionData *data); static void gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindowActionData *data); @@ -112,22 +106,18 @@ static GtkActionEntry gnc_plugin_actions [] = { { "FileSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save _As..."), "s", NULL, G_CALLBACK (gnc_main_window_cmd_file_save_as) }, -#ifdef QSF_IMPORT_NO_LONGER_BROKEN { "FileImportQSFAction", GTK_STOCK_CONVERT, N_("_QSF Import"), NULL, N_("Import a QSF object file"), G_CALLBACK (gnc_main_window_cmd_file_qsf_import) }, -#endif { "FileExportAccountsAction", GTK_STOCK_CONVERT, N_("Export _Accounts"), NULL, N_("Export the account hierarchy to a new GnuCash datafile"), G_CALLBACK (gnc_main_window_cmd_file_export_accounts) }, -#ifdef QSF_EXPORT_NO_LONGER_BROKEN { "FileExportChartAction", GTK_STOCK_CONVERT, 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) }, -#endif /* Edit menu */ @@ -359,7 +349,7 @@ gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *da gnc_window_set_progressbar_window (NULL); /* FIXME GNOME 2 Port (update the title etc.) */ } -#ifdef QSF_IMPORT_NO_LONGER_BROKEN + static void qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs ) { @@ -412,7 +402,7 @@ gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData gtk_widget_show (file_select); gnc_window_set_progressbar_window(NULL); } -#endif + static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data) { @@ -425,7 +415,6 @@ gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowAction /* gnc_refresh_main_window_info (); */ } -#ifdef QSF_EXPORT_NO_LONGER_BROKEN static void gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data) { @@ -437,7 +426,6 @@ gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionDat /* FIXME GNOME 2 Port (update the title etc.) */ /* gnc_refresh_main_window_info (); */ } -#endif static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data) diff --git a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml index e47bfa19af..84e8df005e 100644 --- a/src/gnome/ui/gnc-plugin-basic-commands-ui.xml +++ b/src/gnome/ui/gnc-plugin-basic-commands-ui.xml @@ -15,12 +15,12 @@ - + - +