last 4.5 changes

Makefile.am

+# HomeBank Makefile.am
+
 #SUBDIRS = src
-SUBDIRS = src data images doc mime po
+SUBDIRS = src data images mime po doc
 
 
 # don't forget to do a 'make check' 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
-AC_INIT([homebank], [4.5pre2])
+AC_INIT([homebank], [trunk])
 
 
 AM_CONFIG_HEADER(config.h)

src/gtk-chart.c

@@ -22,6 +22,7 @@
 
 #include <gtk/gtk.h>
 
+#include "homebank.h"
 #include "gtk-chart-colors.h"
 #include "gtk-chart.h"
 
@@ -235,7 +236,7 @@ GtkChart *chart;
 /*
 **
 */
-double GetBase10(double num)
+static double GetBase10(double num)
 {
 double result;
 double cnt;
@@ -252,7 +253,7 @@ double cnt;
 /*
 **
 */
-double GetUnit(double value)
+static double GetUnit(double value)
 {
 double truc, base10, unit;
 
@@ -274,7 +275,7 @@ double truc, base10, unit;
 /*
 ** print a integer number
 */
-gchar *chart_print_int(GtkChart *chart, gint value)
+static gchar *chart_print_int(GtkChart *chart, gint value)
 {
 
 	//mystrfmon(chart->buffer, CHART_BUFFER_LENGTH-1, (gdouble)value, chart->minor);
@@ -297,7 +298,7 @@ gchar *chart_print_int(GtkChart *chart, gint value)
 /*
 ** print a double number
 */
-gchar *chart_print_double(GtkChart *chart, gdouble value)
+static gchar *chart_print_double(GtkChart *chart, gdouble value)
 {
 
 	mystrfmon(chart->buffer, CHART_BUFFER_LENGTH-1, value, chart->minor);

src/hb-preferences.c

@@ -117,22 +117,22 @@ struct lconv *lc = localeconv();
 
     //see g_locale_to_utf8 here
 	iResult = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, wcBuffer, BUFFER_SIZE);
-    printf("LOCALE_SCURRENCY='%s'\n", buffer);
+    DB( g_print("LOCALE_SCURRENCY='%s'\n", buffer) );
     PREFS->base_cur.suffix_symbol = g_locale_to_utf8(buffer, -1, NULL, &toto, NULL);
 
 	iResult = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, wcBuffer, BUFFER_SIZE);
-    printf("LOCALE_SDECIMAL='%s'\n", buffer);
+    DB( g_print("LOCALE_SDECIMAL='%s'\n", buffer) );
     PREFS->base_cur.decimal_char  = g_locale_to_utf8(buffer, -1, NULL, &toto, NULL);
 
 	iResult = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, wcBuffer, BUFFER_SIZE);
-    printf("LOCALE_STHOUSAND='%s'\n", buffer);
+    DB( g_print("LOCALE_STHOUSAND='%s'\n", buffer) );
     PREFS->base_cur.grouping_char = g_locale_to_utf8(buffer, -1, NULL, &toto, NULL);
 
 	PREFS->base_cur.prefix_symbol = NULL; //g_strdup("");
 	//PREFS->base_cur.suffix_symbol = NULL; //g_strdup("");
 	//PREFS->base_cur.decimal_char  = g_strdup(".");
 	//PREFS->base_cur.grouping_char = NULL; //g_strdup("");
-		PREFS->base_cur.frac_digits   = 2;
+	PREFS->base_cur.frac_digits   = 2;
 	#else
 	PREFS->base_cur.prefix_symbol = NULL; //g_strdup("");
 	PREFS->base_cur.suffix_symbol = NULL; //g_strdup("");

src/ui-widgets.c

@@ -414,9 +414,7 @@ GtkWidget *spinner;
 	return spinner;
 }
 
-/*
-**
-*/
+
 GtkWidget *make_year(GtkWidget *label)
 {
 GtkWidget *spinner;
@@ -473,9 +471,7 @@ set_sensitive (GtkCellLayout   *cell_layout,
   g_object_set (cell, "sensitive", sensitive, NULL);
 }
 
-/*
-**
-*/
+
 GtkWidget *make_cycle(GtkWidget *label, gchar **items)
 {
 GtkWidget *combobox;
@@ -485,18 +481,21 @@ guint i;
 
 	for (i = 0; items[i] != NULL; i++)
 	{
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), _(items[i]));
+		if(*items[i] != 0)
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), _(items[i]));
+		else
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), "");
 	}
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
+	gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), is_separator, NULL, NULL);
 
 	if(label)
 		gtk_label_set_mnemonic_widget (GTK_LABEL(label), combobox);
 
-   gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), is_separator, NULL, NULL);
-
 	return combobox;
 }
 
+
 GtkWidget *make_daterange(GtkWidget *label, gboolean custom)
 {
 GtkWidget *combobox;
@@ -509,7 +508,10 @@ guint i;
 
 	for (i = 0; items[i] != NULL; i++)
 	{
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), _(items[i]));
+		if(*items[i] != 0)
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), _(items[i]));
+		else
+			gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), "");
 	}
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
 
@@ -534,10 +536,9 @@ guint i;
 	gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), is_separator, NULL, NULL);
 
 	return combobox;
-
-
 }
 
+
 /*
 **
 */