mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Fix duplicate account name checking bug that prevented editing account
info. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13480 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
018fa4ae6c
commit
53e3e31517
@ -1,3 +1,8 @@
|
||||
2006-03-04 David Hampton <hampton@employees.org>
|
||||
|
||||
* src/gnome-utils/dialog-account.c: Fix duplicate account name
|
||||
checking bug that prevented editing account info.
|
||||
|
||||
2006-03-04 Andreas Köhler <andi5.py@gmx.net>
|
||||
|
||||
* src/gnome/glade/account.glade: set automatic policy on some
|
||||
|
@ -752,7 +752,8 @@ gnc_common_ok (AccountWindow *aw)
|
||||
g_free(fullname_parent);
|
||||
g_free(fullname);
|
||||
}
|
||||
if (account != NULL) {
|
||||
if ((account != NULL) &&
|
||||
!guid_equal(&aw->account, xaccAccountGetGUID (account))) {
|
||||
const char *message = _("There is already an account with that name.");
|
||||
gnc_error_dialog(aw->dialog, message);
|
||||
LEAVE("duplicate name");
|
||||
@ -1359,7 +1360,6 @@ gnc_account_window_set_name (AccountWindow *aw)
|
||||
{
|
||||
char *fullname;
|
||||
char *title;
|
||||
gint length;
|
||||
|
||||
if (!aw || !aw->parent_tree)
|
||||
return;
|
||||
@ -1368,12 +1368,12 @@ gnc_account_window_set_name (AccountWindow *aw)
|
||||
|
||||
if (aw->dialog_type == EDIT_ACCOUNT)
|
||||
title = g_strconcat(_("Edit Account"), " - ", fullname, NULL);
|
||||
else if ((length = g_strv_length (aw->next_name)) > 0)
|
||||
else if (aw->next_name && (g_strv_length(aw->next_name) > 0))
|
||||
{
|
||||
const char *format = _("(%d) New Accounts");
|
||||
char *prefix;
|
||||
|
||||
prefix = g_strdup_printf (format, length + 1);
|
||||
prefix = g_strdup_printf (format, g_strv_length(aw->next_name) + 1);
|
||||
|
||||
title = g_strconcat (prefix, " - ", fullname, " ...", NULL);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user