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

[J. Alex Aycinena]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c0086e15 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b555f495 (commit)



commit c0086e15e957df3589918abbea9c6a3579d24933
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date:   Mon Jun 6 15:17:55 2016 -0700

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

diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c
index 48d4267..3b7bab7 100644
--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@@ -168,14 +168,6 @@ gnc_options_dialog_changed (GNCOptionWin *win)
 }
 
 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)
 {
     gnc_option_set_changed (option, TRUE);
@@ -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:
diff --git a/src/gnome-utils/dialog-options.h b/src/gnome-utils/dialog-options.h
index a981894..4cdcbb1 100644
--- a/src/gnome-utils/dialog-options.h
+++ b/src/gnome-utils/dialog-options.h
@@ -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);
diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
index 681f469..cff961f 100644
--- a/src/gnome-utils/gnc-main-window.c
+++ b/src/gnome-utils/gnc-main-window.c
@@ -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);
     }
 }
 



Summary of changes:
 src/gnome-utils/dialog-options.c  | 12 +++---------
 src/gnome-utils/dialog-options.h  |  1 -
 src/gnome-utils/gnc-main-window.c |  4 ----
 3 files changed, 3 insertions(+), 14 deletions(-)