IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge maint.

Browse Source
This commit is contained in:
Alex Aycinena 2016-06-06 16:28:04 -07:00
commit 9f3dc0c826
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app-utils/gnc-ui-util.c
View File

@ -282,7 +282,6 @@ gnc_book_option_book_currency_selected_cb (gboolean use_book_currency)
}
gnc_book_option_book_currency_selected (use_book_currency);
gnc_resume_gui_refresh ();
gnc_gui_refresh_all ();
}
/** Returns TRUE if both book-currency and default gain/loss policy KVPs exist

12
src/gnome-utils/dialog-options.c
View File

@ -168,14 +168,6 @@ gnc_options_dialog_changed (GNCOptionWin *win)
gnc_options_dialog_changed_internal (win->dialog, TRUE);
}
void
gnc_options_dialog_not_changed (GNCOptionWin *win)
{
if (!win) return;
gnc_options_dialog_changed_internal (win->dialog, FALSE);
}
void
gnc_option_changed_widget_cb(GtkWidget *widget, GNCOption *option)
{
@ -1646,14 +1638,16 @@ gnc_options_dialog_response_cb(GtkDialog *dialog, gint response, GNCOptionWin *w
case GTK_RESPONSE_OK:
case GTK_RESPONSE_APPLY:
gnc_options_dialog_changed_internal (window->dialog, FALSE);
close_cb = window->close_cb;
window->close_cb = NULL;
if (window->apply_cb)
window->apply_cb (window, window->apply_cb_data);
window->close_cb = close_cb;
if (response == GTK_RESPONSE_APPLY)
{
gnc_options_dialog_changed_internal (window->dialog, FALSE);
break;
}
/* fall through */
default:

1
src/gnome-utils/dialog-options.h
View File

@ -46,7 +46,6 @@ GtkWidget * gnc_options_page_list(GNCOptionWin * win);
GtkWidget * gnc_options_dialog_notebook(GNCOptionWin * win);
void gnc_options_dialog_changed (GNCOptionWin *win);
void gnc_options_dialog_not_changed (GNCOptionWin *win);
void gnc_option_changed_widget_cb(GtkWidget *widget, GNCOption *option);
void gnc_option_changed_option_cb(GtkWidget *dummy, GNCOption *option);

7
src/gnome-utils/gnc-main-window.c
View File

@ -3967,14 +3967,7 @@ gnc_book_options_dialog_apply_cb(GNCOptionWin * optionwin,
if (!options) return;
if (gnc_book_options_dialog_apply_helper (options))
{
gnc_gui_refresh_all ();
if (!optionwin) return;
/* the previous stmt causes the 'apply' and 'OK' buttons to be set to
sensitive on the open Book Options dialog; the next stmt resets them
to insensitive, as they should be */
gnc_options_dialog_not_changed (optionwin);
}
}
static void