From 5d69ec7d87bb40c5f652525db123c517bf33c614 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 29 May 2016 15:56:41 -0700 Subject: [PATCH 1/3] Bug 766960 - gnucash-make-guids fails to run due to hardcoded paths. --- src/bin/overrides/CMakeLists.txt | 5 ++--- src/bin/overrides/Makefile.am | 5 ++--- src/bin/overrides/gnucash-make-guids.in | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bin/overrides/CMakeLists.txt b/src/bin/overrides/CMakeLists.txt index 0390377d68..371d313cb2 100644 --- a/src/bin/overrides/CMakeLists.txt +++ b/src/bin/overrides/CMakeLists.txt @@ -9,7 +9,7 @@ SET(GNC_BUILDDIR ${CMAKE_BINARY_DIR}) CONFIGURE_FILE(gnucash-make-guids.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-make-guids) GNC_CONFIGURE(gnucash-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-env) -GNC_CONFIGURE(guile.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/guile) +GNC_CONFIGURE(guile.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/guile) #not installed GNC_CONFIGURE(gnucash-build-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-build-env) # not installed SET(SCRIPT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) @@ -28,6 +28,5 @@ INSTALL( PROGRAMS ${SCRIPT_OUTPUT_DIR}/gnucash-env ${SCRIPT_OUTPUT_DIR}/gnucash-make-guids - ${SCRIPT_OUTPUT_DIR}/guile DESTINATION libexec/gnucash/overrides -) \ No newline at end of file +) diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am index 2476cdf723..74fb50ad12 100644 --- a/src/bin/overrides/Makefile.am +++ b/src/bin/overrides/Makefile.am @@ -2,8 +2,7 @@ gncoverridesdir = ${GNC_LIBEXECDIR}/overrides # When you add a file here, please modify ../test/Makefile.am's overrides.stamp gncoverrides_SCRIPTS = \ gnucash-env \ - gnucash-make-guids \ - guile + gnucash-make-guids EXTRA_DIST = \ gnucash-env.in \ @@ -11,7 +10,7 @@ EXTRA_DIST = \ gnucash-make-guids \ guile.in -noinst_DATA = gnucash-build-env +noinst_DATA = gnucash-build-env guile PWD := $(shell pwd) diff --git a/src/bin/overrides/gnucash-make-guids.in b/src/bin/overrides/gnucash-make-guids.in index d03e135834..df501ce8aa 100755 --- a/src/bin/overrides/gnucash-make-guids.in +++ b/src/bin/overrides/gnucash-make-guids.in @@ -1,5 +1,5 @@ #!/bin/sh -exec gnucash-env @GUILE@ -s "$0" "$@" +exec gnucash-env guile -s "$0" "$@" !# (define (usage) From 293b43dcedc36e9a9c6469b36c3032724d1f824b Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 31 May 2016 13:09:44 +0200 Subject: [PATCH 2/3] Update README file regarding pull request policy --- README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index 14a4564711..6cf4654447 100644 --- a/README +++ b/README @@ -323,8 +323,7 @@ Getting Source with Git We maintain a mirror of our master repository on Github. You can browse the code at https://github.com/Gnucash/gnucash. Clone URIs are on that page, or if you have a Github account you can fork it -there. Note, however, that we do *not* accept Github pull requests: -All patches should be submitted via Bugzilla, see below. +there. ################## Developing GnuCash @@ -355,5 +354,8 @@ Submitting a Patch: patches to either of the mailing lists, as they tend to be forgotten. + Alternatively, you can also submit your patches in the form of a git + pull request. + Thank you. From b555f495676f882c5494560a53ecae5a37c47302 Mon Sep 17 00:00:00 2001 From: Alex Aycinena Date: Sat, 4 Jun 2016 14:41:28 -0700 Subject: [PATCH 3/3] The gnc_gui_refresh_all statement in gnc_book_options_dialog_apply_cb causes the 'apply' and 'OK' buttons to be set to sensitive on the open Book Options dialog in some circumstances; this commit causes them to be reset to insensitive, as they should be. --- src/app-utils/gnc-ui-util.c | 1 - src/gnome-utils/dialog-options.c | 8 ++++++++ src/gnome-utils/dialog-options.h | 1 + src/gnome-utils/gnc-main-window.c | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app-utils/gnc-ui-util.c b/src/app-utils/gnc-ui-util.c index 9251c0fc99..e27bffc145 100644 --- a/src/app-utils/gnc-ui-util.c +++ b/src/app-utils/gnc-ui-util.c @@ -263,7 +263,6 @@ gnc_book_option_num_field_source_change_cb (gboolean num_action) } gnc_book_option_num_field_source_change (num_action); gnc_resume_gui_refresh (); - gnc_gui_refresh_all (); } Account * diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c index 936bc896d6..48d42672c9 100644 --- a/src/gnome-utils/dialog-options.c +++ b/src/gnome-utils/dialog-options.c @@ -167,6 +167,14 @@ 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) { diff --git a/src/gnome-utils/dialog-options.h b/src/gnome-utils/dialog-options.h index 4cdcbb182a..a9818949b8 100644 --- a/src/gnome-utils/dialog-options.h +++ b/src/gnome-utils/dialog-options.h @@ -46,6 +46,7 @@ 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 4b2c2db9e5..681f4693fb 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -3953,7 +3953,14 @@ gnc_book_options_dialog_apply_cb(GNCOptionWin * optionwin, use_split_action_for_num_after = qof_book_use_split_action_for_num_field (gnc_get_current_book ()); if (use_split_action_for_num_before != use_split_action_for_num_after) + { 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); + } } static void