From 8083429f65231519ecb64e1ad9daec050465beba Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 25 May 2001 07:38:29 +0000 Subject: [PATCH] 2001-05-25 Christian Stimming * src/gnome/gnc-html-guppi.c (gnc_has_guppi_version): generalized this function for arbitrary Guppi versions. Tried to enable barchart axis-labels for CVS Guppi but this gives nothing but segfaults. Shit. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4283 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ src/gnome/gnc-html-guppi.c | 31 +++++++++++++++++-------------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index f99845c94a..0c3e4d92e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-05-25 Christian Stimming + + * src/gnome/gnc-html-guppi.c (gnc_has_guppi_version): generalized + this function for arbitrary Guppi versions. Tried to enable + barchart axis-labels for CVS Guppi but this gives nothing but + segfaults. Shit. + 2001-05-25 Dave Peticolas * src/scm/report/account-summary.scm: fix bug diff --git a/src/gnome/gnc-html-guppi.c b/src/gnome/gnc-html-guppi.c index 0ed8d24437..be0b93636b 100644 --- a/src/gnome/gnc-html-guppi.c +++ b/src/gnome/gnc-html-guppi.c @@ -384,18 +384,19 @@ convert_string_array(char ** strings, int nstrings) { } static gboolean -gnc_has_guppi_0_35_4 (void) +gnc_has_guppi_version(int major, int minor, int micro) { - if (guppi_version_major () > 0) + if (guppi_version_major () > major) return TRUE; - - if (guppi_version_minor () > 35) - return TRUE; - - if (guppi_version_minor () < 35) + if (guppi_version_major () < major) return FALSE; - return (guppi_version_micro () > 3); + if (guppi_version_minor () > minor) + return TRUE; + if (guppi_version_minor () < minor) + return FALSE; + + return (guppi_version_micro () >= micro); } /******************************************************************** @@ -621,15 +622,17 @@ gnc_html_embedded_barchart(gnc_html * parent, argind++; } - /* Those are not yet implemented in libguppitank :( */ #if 0 - if((param = g_hash_table_lookup(params, "x_axis_label")) != NULL) { + /* These still give segfault, regardless of what you do. Shit. */ + if(gnc_has_guppi_version(0,35,6) && + (param = g_hash_table_lookup(params, "x_axis_label")) != NULL) { arglist[argind].name = "x_axis_label"; arglist[argind].type = GTK_TYPE_POINTER; GTK_VALUE_POINTER(arglist[argind]) = param; argind++; } - if((param = g_hash_table_lookup(params, "y_axis_label")) != NULL) { + if(gnc_has_guppi_version(0,35,6) && + (param = g_hash_table_lookup(params, "y_axis_label")) != NULL) { arglist[argind].name = "y_axis_label"; arglist[argind].type = GTK_TYPE_POINTER; GTK_VALUE_POINTER(arglist[argind]) = param; @@ -755,7 +758,7 @@ gnc_html_embedded_barchart(gnc_html * parent, datarows*datacols); g_free(callbacks); } - if(gnc_has_guppi_0_35_4 () && + if(gnc_has_guppi_version(0,35,4) && (param = g_hash_table_lookup(params, "legend_reversed")) != NULL) { sscanf(param, "%d", &rotate); arglist[argind].name = "legend_reversed"; @@ -763,7 +766,7 @@ gnc_html_embedded_barchart(gnc_html * parent, GTK_VALUE_BOOL(arglist[argind]) = rotate; argind++; } - if(gnc_has_guppi_0_35_4 () && + if(gnc_has_guppi_version(0,35,4) && (param = g_hash_table_lookup(params, "stacked")) != NULL) { sscanf(param, "%d", &stacked); arglist[argind].name = "stacked"; @@ -771,7 +774,7 @@ gnc_html_embedded_barchart(gnc_html * parent, GTK_VALUE_BOOL(arglist[argind]) = stacked; argind++; } - if(gnc_has_guppi_0_35_4 () && + if(gnc_has_guppi_version(0,35,4) && (param = g_hash_table_lookup(params, "normalize_stacks")) != NULL) { sscanf(param, "%d", &normalize_stacks); arglist[argind].name = "normalize_stacks";