* src/gnome/window-main.c: take out devel menu

* src/gnome/dialog-price-editor.c (price_ok_clicked): fix bug


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3972 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas
2001-04-15 11:01:03 +00:00
parent ee54839e07
commit 81ef8cb5c2
3 changed files with 20 additions and 17 deletions

View File

@@ -1,3 +1,9 @@
2001-04-15 Dave Peticolas <dave@krondo.com>
* src/gnome/window-main.c: take out devel menu
* src/gnome/dialog-price-editor.c (price_ok_clicked): fix bug
2001-04-15 Christian Stimming <stimming@tuhh.de>
* src/scm/report.scm: Defined global identifiers for some option

View File

@@ -394,6 +394,8 @@ static void
price_ok_clicked (GtkWidget *widget, gpointer data)
{
PricesDialog *pdb_dialog = data;
GNCBook *book = gncGetCurrentBook ();
GNCPriceDB *pdb = gnc_book_get_pricedb (book);
const char *error_str;
if (!pdb_dialog->changed)
@@ -402,30 +404,31 @@ price_ok_clicked (GtkWidget *widget, gpointer data)
return;
}
if (!pdb_dialog->new)
gnc_pricedb_remove_price (pdb, pdb_dialog->price);
error_str = gui_to_price (pdb_dialog);
if (error_str)
{
gnc_warning_dialog_parented (pdb_dialog->price_dialog, error_str);
if (!pdb_dialog->new)
gnc_pricedb_add_price (pdb, pdb_dialog->price);
return;
}
gtk_widget_hide (pdb_dialog->price_dialog);
if (pdb_dialog->new)
if (!gnc_pricedb_add_price (pdb, pdb_dialog->price))
{
GNCBook *book = gncGetCurrentBook ();
GNCPriceDB *pdb = gnc_book_get_pricedb (book);
if (!gnc_pricedb_add_price (pdb, pdb_dialog->price))
{
gnc_price_unref (pdb_dialog->price);
pdb_dialog->price = NULL;
}
pdb_dialog->new = FALSE;
gnc_price_unref (pdb_dialog->price);
pdb_dialog->price = NULL;
}
pdb_dialog->new = FALSE;
gnc_gui_refresh_all ();
pdb_dialog->changed = FALSE;

View File

@@ -804,17 +804,11 @@ gnc_main_window_create_menus(GNCMainInfo * maininfo) {
GNOMEUIINFO_END
};
static GnomeUIInfo gnc_developer_menu_template[] =
{
GNOMEUIINFO_END
};
static GnomeUIInfo gnc_main_menu_template[] =
{
GNOMEUIINFO_MENU_FILE_TREE(gnc_file_menu_template),
GNOMEUIINFO_SUBTREE(N_("_Tools"), gnc_tools_menu_template),
GNOMEUIINFO_SUBTREE(N_("_Settings"), gnc_settings_menu_template),
GNOMEUIINFO_SUBTREE(N_("_Devel Options"), gnc_developer_menu_template),
GNOMEUIINFO_SUBTREE(N_("_Windows"), gnc_windows_menu_template),
GNOMEUIINFO_MENU_HELP_TREE(gnc_help_menu_template),
GNOMEUIINFO_END