Aggiunto il parametro decimali alla funzione solipa_format_money.

Alcune correzioni ai file header.

diff --git a/src/allegato.h b/src/allegato.h
index b26b9f07aa426f7ca9bc80d3c32c1a697153f749..4d0ba30ccb2b4b923bbaf43c5dcc85faf8c8c9d0 100644 (file)
--- a/src/allegato.h
+++ b/src/allegato.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <solipa.h>
+#include <libsolipa/solipa.h>
 
 
 G_BEGIN_DECLS

diff --git a/src/libsolipa.h b/src/libsolipa.h
index 81b23794469934d31f18aa03aae135d4cac058dd..a7c7ae7bf7385317c9b808f572600e908fbca16b 100644 (file)
--- a/src/libsolipa.h
+++ b/src/libsolipa.h
@@ -22,5 +22,6 @@
 #include <libsolipa/solipa.h>
 #include <libsolipa/allegato.h>
 #include <libsolipa/mail.h>
+#include <libsolipa/utils.h>
 
 #endif /* __LIBSOLIPA_H__ */

diff --git a/src/mail.h b/src/mail.h
index 348bce331a2afc3614558be8dfd573421c412699..1cfbce22f931bae39324fb3c0c4c8a3e2916242d 100644 (file)
--- a/src/mail.h
+++ b/src/mail.h
@@ -24,7 +24,7 @@
 
 #include <camel/camel.h>
 
-#include <solipa.h>
+#include <libsolipa/solipa.h>
 
 
 G_BEGIN_DECLS

diff --git a/src/utils.c b/src/utils.c
index 3031c20ceb52014d36db57de9f2a15732b86b671..e0b9fb7cbc7b80bbf2a97138ed6f7df4e32ede4c 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -395,13 +395,16 @@ solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
 }
 
 gchar
-*solipa_format_money (gdouble number, gboolean with_currency_symbol)
+*solipa_format_money (gdouble number,
+                      gint decimals,
+                      gboolean with_currency_symbol)
 {
        gchar *ret;
 
        GRegex *regex;
        GError *error;
 
+       gchar *str_format;
        gchar *str;
        gssize str_len;
 
@@ -422,7 +425,8 @@ gchar
                        return "";
                }
 
-       ret = g_strdup_printf ("%0.2f", number);
+       str_format = g_strdup_printf ("%%0%sf", decimals == 0 ? "" : (decimals < 0 ? ".2" : g_strdup_printf (".%d", decimals)));
+       ret = g_strdup_printf (str_format, number);
 
        while (TRUE)
                {
@@ -442,6 +446,7 @@ gchar
                        if (g_strcmp0 (ret, str) != 0)
                                {
                                        ret = g_strdup (str);
+                                       g_free (str);
                                }
                        else
                                {

diff --git a/src/utils.h b/src/utils.h
index c0a6cf4faf43ea9ec406a4ad9545f3e1b009b436..3bac23df19869139813558e0285658e1849aba9c 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include <solipa.h>
+#include <libsolipa/solipa.h>
 
 
 G_BEGIN_DECLS
@@ -42,7 +42,7 @@ void solipa_gtktreemodel_to_csv_gui (Solipa *solipa, GtkTreeModel *model,
                                  gchar **columns_title,
                                  guint n_columns);
 
-gchar *solipa_format_money (gdouble number, gboolean with_currency_symbol);
+gchar *solipa_format_money (gdouble number, gint decimals, gboolean with_currency_symbol);
 
 
 G_END_DECLS

diff --git a/tests/utils_format_money.c b/tests/utils_format_money.c
index 6a62da82535282a6bfa18fca71134e3f912ad280..7c357cae83637b698906959996b8b4811544e019 100644 (file)
--- a/tests/utils_format_money.c
+++ b/tests/utils_format_money.c
@@ -24,7 +24,7 @@ main (int argc, char *argv[])
 {
        gtk_init (&argc, &argv);
 
-       g_message ("%s", solipa_format_money (g_strtod (argv[1], NULL), FALSE));
+       g_message ("%s", solipa_format_money (g_strtod (argv[1], NULL), 3, FALSE));
 
        return 0;
 }