Partially revert commit B555f495 and solve problem more simply by instead resequencing prior statements.

This commit is contained in:
Alex Aycinena 2016-06-06 15:17:55 -07:00
parent b555f49567
commit c0086e15e9
3 changed files with 3 additions and 14 deletions

View File

@ -167,14 +167,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)
{
@ -1321,14 +1313,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:

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);

View File

@ -3956,10 +3956,6 @@ gnc_book_options_dialog_apply_cb(GNCOptionWin * optionwin,
{
gnc_book_option_num_field_source_change_cb (use_split_action_for_num_after);
gnc_gui_refresh_all ();
/* 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);
}
}