gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/fb67e1f2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/58f34f75 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4ed4aa4b (commit)
	from  https://github.com/Gnucash/gnucash/commit/e69689fa (commit)



commit fb67e1f265afeb89a1fcf0b28b5888554fb82e63
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Oct 10 16:16:19 2015 +0200

    Bug 646129 - Account selection in reports: 'Select Children' doesn't actually select children if they are collapsed

diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c
index d281e74..936bc89 100644
--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@@ -721,14 +721,15 @@ gnc_option_account_select_children_cb(GtkWidget *widget, gpointer data)
 {
     GNCOption *option = data;
     GncTreeViewAccount *tree_view;
-    Account *account;
+    GList *acct_list = NULL, *acct_iter = NULL;
 
     tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
-    account = gnc_tree_view_account_get_cursor_account(tree_view);
-    if (!account)
-        return;
+    acct_list = gnc_tree_view_account_get_selected_accounts (tree_view);
+
+    for (acct_iter = acct_list; acct_iter; acct_iter = acct_iter->next)
+        gnc_tree_view_account_select_subaccounts (tree_view, acct_iter->data);
 
-    gnc_tree_view_account_select_subaccounts(tree_view, account);
+    g_list_free (acct_list);
 }
 
 static GtkWidget *

commit 58f34f75e14af33fd8f079286c460f9b2cb905ac
Author: Stefan Soeffing <soeffing at gmx.de>
Date:   Wed May 20 18:49:06 2015 +0200

    Bug 627692 - Report options, Account Selection, "select all" => not all accounts selected, only visible ones
    
    Expand all accounts first, so that all accounts are visible and get selected.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=627692

diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c
index 64aba22..d281e74 100644
--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@@ -697,6 +697,7 @@ gnc_option_account_select_all_cb(GtkWidget *widget, gpointer data)
     GtkTreeSelection *selection;
 
     tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
+    gtk_tree_view_expand_all(GTK_TREE_VIEW(tree_view));
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
     gtk_tree_selection_select_all(selection);
     gnc_option_changed_widget_cb(widget, option);

commit 4ed4aa4b7016d5180fe8d2227bb974d7468d85a5
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Oct 10 16:18:42 2015 +0200

    Revert "- Report options, Account Selection, "select all" => not all accounts selected, only visible ones"
    
    This reverts commit e69689faa208857ef481278859fafd0124a377b5.
    Reversion reason: The bug number got lost somewhere

diff --git a/src/gnome-utils/dialog-options.c b/src/gnome-utils/dialog-options.c
index d281e74..64aba22 100644
--- a/src/gnome-utils/dialog-options.c
+++ b/src/gnome-utils/dialog-options.c
@@ -697,7 +697,6 @@ gnc_option_account_select_all_cb(GtkWidget *widget, gpointer data)
     GtkTreeSelection *selection;
 
     tree_view = GNC_TREE_VIEW_ACCOUNT(gnc_option_get_gtk_widget (option));
-    gtk_tree_view_expand_all(GTK_TREE_VIEW(tree_view));
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
     gtk_tree_selection_select_all(selection);
     gnc_option_changed_widget_cb(widget, option);



Summary of changes:
 src/gnome-utils/dialog-options.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)