gnucash master: Multiple changes pushed

[J. Alex Aycinena]

Updated	 via  https://github.com/Gnucash/gnucash/commit/da878291 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b7b8f6f5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/39849b8a (commit)
	from  https://github.com/Gnucash/gnucash/commit/56441bd8 (commit)



commit da878291eb5ef55aec7f8123060ef1e08710db7b
Merge: 56441bd b7b8f6f
Author: gnucash-dev <gnucash-dev at HPdv5Fedora.home>
Date:   Wed Mar 4 15:32:17 2015 -0800

    Merge branch 'maint'


commit b7b8f6f5a727c37bc77a6f73edd3f3e9f2488a09
Author: gnucash-dev <gnucash-dev at HPdv5Fedora.home>
Date:   Wed Mar 4 15:25:15 2015 -0800

    To fix build error: ISO C90 forbids mixed declarations and code

diff --git a/src/gnome-utils/gnc-query-view.c b/src/gnome-utils/gnc-query-view.c
index 05d1267..06e3d3f 100644
--- a/src/gnome-utils/gnc-query-view.c
+++ b/src/gnome-utils/gnc-query-view.c
@@ -796,12 +796,14 @@ gnc_query_view_fill (GNCQueryView *qview)
         {
             gboolean result;
             GNCSearchParamSimple *param = node->data;
-            g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param));
-            GSList *converters = gnc_search_param_get_converters (param);
+            GSList *converters = NULL;
             const char *type = gnc_search_param_get_param_type ((GNCSearchParam *) param);
             gpointer res = item->data;
             gchar *qofstring;
 
+            g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param));
+            converters = gnc_search_param_get_converters (param);
+
             /* Test for boolean type */
             if (g_strcmp0 (type, QOF_TYPE_BOOLEAN) == 0)
             {

commit 39849b8a60a97f5b55abf995b55cae5990fa0404
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed Mar 4 15:08:24 2015 +0100

    Stop checking for F::Q dependencies
    
    The list of checks was partly obsolete and incomplete anyway.
    Instead assume if F::Q was installed so are its dependencies.
    Both cpan and ppm installs take care of this properly. Those
    are the only two installation methods we always recommend.

diff --git a/src/quotes/gnc-fq-check.in b/src/quotes/gnc-fq-check.in
index 09b6fa0..771072e 100644
--- a/src/quotes/gnc-fq-check.in
+++ b/src/quotes/gnc-fq-check.in
@@ -52,7 +52,7 @@ non-zero - failure
 =cut
 
 sub check_modules {
-  my @modules = qw(Finance::Quote LWP HTTP::Request::Common HTML::TableExtract Crypt::SSLeay Date::Manip);
+  my @modules = qw(Finance::Quote);
   my @missing;
 
   foreach my $mod (@modules) {
diff --git a/src/quotes/gnc-fq-dump b/src/quotes/gnc-fq-dump
index 68b192f..2b1ab1e 100755
--- a/src/quotes/gnc-fq-dump
+++ b/src/quotes/gnc-fq-dump
@@ -21,7 +21,7 @@
 use strict;
 
 sub check_modules {
-  my @modules = qw(Finance::Quote LWP HTTP::Request::Common HTML::TableExtract Crypt::SSLeay);
+  my @modules = qw(Finance::Quote);
   my @missing;
 
   foreach my $mod (@modules) {
diff --git a/src/quotes/gnc-fq-helper.in b/src/quotes/gnc-fq-helper.in
index eb7862e..f6759bb 100644
--- a/src/quotes/gnc-fq-helper.in
+++ b/src/quotes/gnc-fq-helper.in
@@ -122,7 +122,7 @@ non-zero - failure
 # signature so this works OK.
 
 sub check_modules {
-  my @modules = qw(Finance::Quote LWP HTTP::Request::Common HTML::TableExtract Crypt::SSLeay);
+  my @modules = qw(Finance::Quote);
   my @missing;
 
   foreach my $mod (@modules) {



Summary of changes:
 src/gnome-utils/gnc-query-view.c | 6 ++++--
 src/quotes/gnc-fq-check.in       | 2 +-
 src/quotes/gnc-fq-dump           | 2 +-
 src/quotes/gnc-fq-helper.in      | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)