[grisbi-cvs] grisbi/src gsb_bank.c, 1.24, 1.25 gsb_calendar_entry.c, 1.26, 1.27 gsb_data_account.c, 1.73, 1.74 gsb_file.c, 1.49, 1.50 gsb_file_load.c, 1.173, 1.174 gsb_real.c, 1.37, 1.38 gsb_real.h, 1.15, 1.16 gsb_real_cunit.c, 1.3, 1.4 gsb_real_cunit.h, 1.1, 1.2 gsb_scheduler_list.c, 1.66, 1.67 gsb_select_icon.c, 1.13, 1.14 gsb_transactions_list.c, 1.163, 1.164 gsb_transactions_list.h, 1.33, 1.34 import.c, 1.278, 1.279 main.c, 1.142, 1.143 navigation.c, 1.120, 1.121 tiers_onglet.c, 1.160, 1.161 utils_dates.c, 1.51, 1.52 utils_dates.h, 1.20, 1.21
Pierre Biava
pbiava at users.sourceforge.net
Sun May 17 17:53:28 CEST 2009
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.32, 1.33 da.po, 1.39, 1.40 de.po, 1.84, 1.85 el.po, 1.3, 1.4 es.po, 1.77, 1.78 fa.po, 1.26, 1.27 fr.po, 1.156, 1.157 grisbi.pot, 1.74, 1.75 he.po, 1.32, 1.33 it.po, 1.32, 1.33 nl.po, 1.31, 1.32 pl.po, 1.37, 1.38 pt_BR.po, 1.34, 1.35 ro.po, 1.32, 1.33 ru.po, 1.31, 1.32 zh_CN.po, 1.26, 1.27
- Next message: [grisbi-cvs] grisbi/src gsb_account_property.c,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2244/src
Modified Files:
gsb_bank.c gsb_calendar_entry.c gsb_data_account.c gsb_file.c
gsb_file_load.c gsb_real.c gsb_real.h gsb_real_cunit.c
gsb_real_cunit.h gsb_scheduler_list.c gsb_select_icon.c
gsb_transactions_list.c gsb_transactions_list.h import.c
main.c navigation.c tiers_onglet.c utils_dates.c utils_dates.h
Log Message:
mk_include, make update-po and modification of the configuration page of accounts
Index: gsb_transactions_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_transactions_list.h 26 Apr 2009 17:39:34 -0000 1.33
+++ gsb_transactions_list.h 17 May 2009 15:53:25 -0000 1.34
@@ -48,7 +48,7 @@
gboolean gsb_transactions_list_append_new_transaction ( gint transaction_number,
gboolean update_tree_view );
gboolean gsb_transactions_list_delete_transaction ( gint transaction_number,
- gint show_warning );
+ gint show_warning );
gboolean gsb_transactions_list_delete_transaction_from_tree_view ( gint transaction_number );
gboolean gsb_transactions_list_edit_current_transaction ( void );
gboolean gsb_transactions_list_edit_transaction ( gint transaction_number );
Index: gsb_real.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_real.h 11 May 2009 18:54:27 -0000 1.15
+++ gsb_real.h 17 May 2009 15:53:25 -0000 1.16
@@ -28,9 +28,6 @@
gsb_real gsb_real_double_to_real ( gdouble number );
gsb_real gsb_real_get_from_string ( const gchar *string );
gchar *gsb_real_get_string ( gsb_real number );
-gchar *gsb_real_raw_format_string ( gsb_real number,
- struct lconv *conv,
- const gchar *currency_symbol );
gchar *gsb_real_get_string_with_currency ( gsb_real number,
gint currency_number,
gboolean show_symbol );
@@ -38,6 +35,9 @@
gsb_real number_2 );
gsb_real gsb_real_new ( gint mantissa, gint exponent );
gsb_real gsb_real_opposite ( gsb_real number );
+gchar *gsb_real_raw_format_string (gsb_real number,
+ struct lconv *conv,
+ const gchar *currency_symbol );
gsb_real gsb_real_sub ( gsb_real number_1,
gsb_real number_2 );
/* END_DECLARATION */
Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- gsb_scheduler_list.c 13 May 2009 20:15:55 -0000 1.66
+++ gsb_scheduler_list.c 17 May 2009 15:53:25 -0000 1.67
@@ -35,7 +35,6 @@
#include "./barre_outils.h"
#include "./dialog.h"
#include "./utils_dates.h"
-#include "./gsb_account_property.h"
#include "./gsb_automem.h"
#include "./gsb_calendar.h"
#include "./gsb_data_account.h"
@@ -80,7 +79,7 @@
GdkEventKey *ev );
static gboolean gsb_scheduler_list_popup_custom_periodicity_dialog (void);
static gboolean gsb_scheduler_list_selection_changed ( GtkTreeSelection *selection,
- gpointer null );
+ gpointer null );
static void gsb_scheduler_list_set_model ( GtkTreeModel *model );
static void gsb_scheduler_list_set_sorted_model ( GtkTreeModelSort *tree_model_sort );
static void gsb_scheduler_list_set_tree_view ( GtkWidget *tree_view );
@@ -1408,7 +1407,7 @@
* \return FALSE
* */
gboolean gsb_scheduler_list_selection_changed ( GtkTreeSelection *selection,
- gpointer null )
+ gpointer null )
{
gint tmp_number = 0;
gint account_number;
Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gsb_file.c 10 May 2009 16:08:05 -0000 1.49
+++ gsb_file.c 17 May 2009 15:53:25 -0000 1.50
@@ -1,8 +1,8 @@
/* ************************************************************************** */
/* */
-/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: gsb_real.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gsb_real.c 12 May 2009 20:45:13 -0000 1.37
+++ gsb_real.c 17 May 2009 15:53:25 -0000 1.38
@@ -1,11 +1,12 @@
/* ************************************************************************** */
/* */
-/* gsb_real */
+/* gsb_real */
/* */
/* Copyright (C) 2000-2007 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
+/* 2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* 2009 Mickaël Remars (grisbi at remars.com) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- main.c 11 May 2009 18:54:27 -0000 1.142
+++ main.c 17 May 2009 15:53:25 -0000 1.143
@@ -1,7 +1,7 @@
/* *******************************************************************************/
/* GRISBI */
/* Programme de gestion financière personnelle */
-/* license : GPLv2 */
+/* license : GPLv2 */
/* */
/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
@@ -45,6 +45,7 @@
#include "./gsb_file_config.h"
#include "./gsb_status.h"
#include "./gsb_plugins.h"
+#include "./gsb_real_cunit.h"
#include "./traitement_variables.h"
#include "./erreur.h"
#include "./parse_cmdline.h"
@@ -58,6 +59,7 @@
/*START_STATIC*/
+static int gsb_cunit_run_tests();
static gboolean gsb_grisbi_change_state_window ( GtkWidget *window,
GdkEventWindowState *event,
gpointer null );
@@ -166,7 +168,7 @@
if ( setlocale ( LC_MONETARY, getenv ( "LC_MONETARY" ) ) == NULL )
{
- setlocale ( LC_MONETARY, getenv ( "LANG" ) );
+ setlocale ( LC_MONETARY, getenv ( "LANG" ) );
}
gtk_init(&argc, &argv);
@@ -180,7 +182,7 @@
sigemptyset (&(sig_sev.sa_mask));
if ( sigaction ( SIGSEGV, &sig_sev, NULL ))
- g_print (_("Error on sigaction: SIGSEGV won't be trapped\n"));
+ g_print (_("Error on sigaction: SIGSEGV won't be trapped\n"));
#endif
/* parse command line parameter, exit with correct error code when needed */
@@ -198,10 +200,8 @@
#endif
/* create the icon of grisbi (set in the panel of gnome or other) */
string = g_build_filename ( PIXMAPS_DIR, "grisbi.png", NULL );
- if (g_file_test ( string,
- G_FILE_TEST_EXISTS ))
- gtk_window_set_default_icon_from_file ( string,
- NULL );
+ if ( g_file_test ( string, G_FILE_TEST_EXISTS ) )
+ gtk_window_set_default_icon_from_file ( string, NULL );
g_free (string);
/* initialisation of the variables */
Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- navigation.c 8 May 2009 17:21:15 -0000 1.120
+++ navigation.c 17 May 2009 15:53:25 -0000 1.121
@@ -1082,11 +1082,13 @@
currency_number = gsb_data_account_get_currency (account_number);
if (gsb_data_account_get_current_balance (account_number).mantissa < 0)
suffix = g_strdup_printf ( "<span color=\"red\">%s</span>",
- gsb_real_get_string_with_currency ( gsb_data_account_get_current_balance (account_number),
- currency_number, TRUE ));
+ gsb_real_get_string_with_currency (
+ gsb_data_account_get_current_balance ( account_number ),
+ currency_number, TRUE ) );
else
- suffix = gsb_real_get_string_with_currency ( gsb_data_account_get_current_balance (account_number),
- currency_number, TRUE );
+ suffix = gsb_real_get_string_with_currency (
+ gsb_data_account_get_current_balance ( account_number ),
+ currency_number, TRUE );
if (!suffix)
suffix = g_strdup("");
gsb_gui_headings_update ( title, suffix );
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- import.c 10 May 2009 13:06:56 -0000 1.278
+++ import.c 17 May 2009 15:53:25 -0000 1.279
@@ -1,9 +1,9 @@
/* ************************************************************************** */
/* */
-/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2004-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2004-2008 Benjamin Drieu (bdrieu at april.org) */
+/* 2008-2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: gsb_select_icon.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_select_icon.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_select_icon.c 27 Apr 2009 19:41:03 -0000 1.13
+++ gsb_select_icon.c 17 May 2009 15:53:25 -0000 1.14
@@ -1,10 +1,9 @@
/* ************************************************************************** */
/* */
-/* copyright (c) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2004-2009 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2009 Pierre Biava (pierre at pierre.biava.name) */
-/* */
-/* http://www.grisbi.org */
+/* copyright (c) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2004-2009 Benjamin Drieu (bdrieu at april.org) */
+/* 2008-2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: gsb_calendar_entry.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_calendar_entry.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gsb_calendar_entry.c 16 May 2009 06:59:51 -0000 1.26
+++ gsb_calendar_entry.c 17 May 2009 15:53:25 -0000 1.27
@@ -36,7 +36,6 @@
#include "./utils_dates.h"
#include "./gsb_form_widget.h"
#include "./include.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: utils_dates.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_dates.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- utils_dates.h 16 May 2009 06:59:51 -0000 1.20
+++ utils_dates.h 17 May 2009 15:53:26 -0000 1.21
@@ -7,7 +7,7 @@
/* START_DECLARATION */
GDate *gdate_today ( void );
gboolean gsb_date_check_and_complete_entry ( GtkWidget *entry,
- gboolean set_today );
+ gboolean set_today );
gboolean gsb_date_check_entry ( GtkWidget *entry );
GDate *gsb_date_copy ( const GDate *date );
void gsb_date_free_last_date ( void );
Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- gsb_data_account.c 10 May 2009 13:06:56 -0000 1.73
+++ gsb_data_account.c 17 May 2009 15:53:25 -0000 1.74
@@ -1,9 +1,9 @@
/* ************************************************************************** */
/* */
-/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2008-2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
+/* 2008-2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
@@ -127,6 +127,7 @@
/*END_STATIC*/
/*START_EXTERN*/
+extern GtkWidget *detail_nom_compte;
extern gsb_real null_real;
extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
/*END_EXTERN*/
@@ -2560,13 +2561,19 @@
void gsb_data_account_change_account_icon ( GtkWidget *button, gpointer data )
{
GdkPixbuf * pixbuf;
- GtkWidget *image;
+ GtkWidget *image, *bouton;
gchar * name_icon;
gchar * new_icon;
gint current_account;
devel_debug ( NULL );
- image = gtk_button_get_image ( GTK_BUTTON ( button ) );
+
+ if ( GTK_IS_BUTTON (button) == FALSE )
+ bouton = g_object_get_data ( G_OBJECT ( detail_nom_compte), "ac_icon_button" );
+ else
+ bouton = button;
+
+ image = gtk_button_get_image ( GTK_BUTTON ( bouton ) );
pixbuf = gtk_image_get_pixbuf ( GTK_IMAGE ( image ) );
if ( pixbuf )
name_icon = g_object_get_data ( G_OBJECT ( pixbuf ), "name_icon" );
@@ -2579,7 +2586,7 @@
current_account = gsb_gui_navigation_get_current_account ();
gsb_data_account_set_name_icon ( current_account, new_icon );
image = gsb_data_account_get_account_icon_image ( current_account );
- gtk_button_set_image ( GTK_BUTTON ( button ), image );
+ gtk_button_set_image ( GTK_BUTTON ( bouton ), image );
gsb_gui_navigation_update_account ( current_account );
}
}
Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- gsb_file_load.c 8 May 2009 17:21:15 -0000 1.173
+++ gsb_file_load.c 17 May 2009 15:53:25 -0000 1.174
@@ -1,9 +1,9 @@
/* ************************************************************************** */
/* */
-/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2009 Benjamin Drieu (bdrieu at april.org) */
-/* 2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2003-2009 Benjamin Drieu (bdrieu at april.org) */
+/* 2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- gsb_transactions_list.c 17 May 2009 13:58:24 -0000 1.163
+++ gsb_transactions_list.c 17 May 2009 15:53:25 -0000 1.164
@@ -81,7 +81,7 @@
gint *no_column );
static gboolean gsb_transactions_list_check_mark ( gint transaction_number );
static gint gsb_transactions_list_choose_reconcile ( gint account_number,
- gint selected_reconcile_number );
+ gint selected_reconcile_number );
static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
gpointer null );
static gint gsb_transactions_list_clone_transaction ( gint transaction_number,
Index: utils_dates.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_dates.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- utils_dates.c 17 May 2009 10:33:21 -0000 1.51
+++ utils_dates.c 17 May 2009 15:53:25 -0000 1.52
@@ -30,11 +30,10 @@
#include "./gsb_form_widget.h"
#include "./utils_str.h"
#include "./gsb_calendar_entry.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
-static gchar ** split_unique_datefield ( gchar * string, gchar date_tokens [] );
+static gchar **split_unique_datefield ( gchar * string, gchar date_tokens [] );
/*END_STATIC*/
Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gsb_bank.c 13 May 2009 20:15:55 -0000 1.24
+++ gsb_bank.c 17 May 2009 15:53:25 -0000 1.25
@@ -48,8 +48,8 @@
/*START_STATIC*/
static gboolean gsb_bank_add ( GtkWidget *button,
gpointer null );
-static void gsb_bank_code_changed ( GtkEntry *entry, gpointer data );
static void gsb_bank_bic_code_changed ( GtkEntry *entry, gpointer data );
+static void gsb_bank_code_changed ( GtkEntry *entry, gpointer data );
static gboolean gsb_bank_combobox_changed ( GtkWidget *combobox,
gboolean default_func (gint, gint));
static gboolean gsb_bank_create_combobox_model ( void );
Index: tiers_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tiers_onglet.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- tiers_onglet.c 8 May 2009 17:21:15 -0000 1.160
+++ tiers_onglet.c 17 May 2009 15:53:25 -0000 1.161
@@ -1,9 +1,9 @@
/* ************************************************************************** */
/* */
-/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
+/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
+/* 2009 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
Index: gsb_real_cunit.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real_cunit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gsb_real_cunit.c 12 May 2009 20:45:57 -0000 1.3
+++ gsb_real_cunit.c 17 May 2009 15:53:25 -0000 1.4
@@ -2,10 +2,10 @@
/* */
/* gsb_real_cunit */
/* */
-/* Copyright (C) 2000-2007 Cédric Auger (cedric at grisbi.org) */
-/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 2009 Pierre Biava (pierre at pierre.biava.name) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2000-2007 Cédric Auger (cedric at grisbi.org) */
+/* 2003-2008 Benjamin Drieu (bdrieu at april.org) */
+/* 2009 Mickaël Remars (grisbi at remars.com) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
@@ -28,10 +28,23 @@
* cunit tests for gsb_real
*/
+#include "include.h"
+
+/* START_INCLUDE */
#include "gsb_real_cunit.h"
+#include "./gsb_real.h"
+/* END_INCLUDE */
-#include "include.h"
-#include "gsb_real.h"
+/* START_STATIC */
+static void gsb_real_cunit__gsb_real_add ( void );
+static void gsb_real_cunit__gsb_real_get_from_string ( void );
+static void gsb_real_cunit__gsb_real_raw_format_string ( void );
+static int gsb_real_cunit_clean_suite ( void );
+static int gsb_real_cunit_init_suite ( void );
+/* END_STATIC */
+
+/* START_EXTERN */
+/* END_EXTERN */
/* The suite initialization function.
* Returns zero on success, non-zero otherwise.
@@ -49,7 +62,7 @@
return 0;
}
-void gsb_real_cunit__gsb_real_get_from_string()
+void gsb_real_cunit__gsb_real_get_from_string ( void )
{
gsb_real val = gsb_real_get_from_string("123,45");
CU_ASSERT_EQUAL(12345, val.mantissa);
@@ -60,7 +73,7 @@
CU_ASSERT_EQUAL(0, val.exponent);
}
-void gsb_real_cunit__gsb_real_raw_format_string()
+void gsb_real_cunit__gsb_real_raw_format_string ( void )
{
gchar *s;
gsb_real n;
@@ -70,30 +83,30 @@
conv.negative_sign = "<->";
conv.mon_thousands_sep = "< >";
conv.mon_decimal_point = "<.>";
- gchar *currency_symbol = "<¤>";
+ gchar *currency_symbol = "<¤>";
n.mantissa = 1;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>01<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>01<¤>", s);
g_free(s);
n.mantissa = 10;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>10<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>10<¤>", s);
g_free(s);
n.mantissa = 31415;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>3< >141<.>5<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>3< >141<.>5<¤>", s);
g_free(s);
n.mantissa = 31415;
n.exponent = 9;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>0<.>000031415<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>0<.>000031415<¤>", s);
g_free(s);
n.mantissa = 31415;
@@ -111,37 +124,37 @@
n.mantissa = 0x7FFFFFFF;
n.exponent = 0;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>2< >147< >483< >647<.>0<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>2< >147< >483< >647<.>0<¤>", s);
g_free(s);
n.mantissa = 0x7FFFFFFF;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>214< >748< >364<.>7<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>214< >748< >364<.>7<¤>", s);
g_free(s);
n.mantissa = 0x7FFFFFFF;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>21< >474< >836<.>47<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>21< >474< >836<.>47<¤>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 0;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->2< >147< >483< >647<.>0<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->2< >147< >483< >647<.>0<¤>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 1;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->214< >748< >364<.>7<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->214< >748< >364<.>7<¤>", s);
g_free(s);
n.mantissa = 0x80000001;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<->21< >474< >836<.>47<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<->21< >474< >836<.>47<¤>", s);
g_free(s);
n.mantissa = 0x80000000;
@@ -153,25 +166,25 @@
n.mantissa = 2100000000;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>21< >000< >000<.>00<¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>21< >000< >000<.>00<¤>", s);
g_free(s);
conv.p_sep_by_space = 1;
n.mantissa = 123;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
g_free(s);
conv.p_sep_by_space = 1;
n.mantissa = 123;
n.exponent = 2;
s = gsb_real_raw_format_string(n, &conv, currency_symbol);
- CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
+ CU_ASSERT_STRING_EQUAL("<+>1<.>23 <¤>", s);
g_free(s);
}
-void gsb_real_cunit__gsb_real_add()
+void gsb_real_cunit__gsb_real_add ( void )
{
gsb_real a = {1, 0};
gsb_real b = {31415, 4};
@@ -180,7 +193,7 @@
CU_ASSERT_EQUAL(4, r.exponent);
}
-CU_pSuite gsb_real_cunit_create_suite()
+CU_pSuite gsb_real_cunit_create_suite ( void )
{
CU_pSuite pSuite = CU_add_suite("gsb_real",
gsb_real_cunit_init_suite,
Index: gsb_real_cunit.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real_cunit.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gsb_real_cunit.h 11 May 2009 18:54:27 -0000 1.1
+++ gsb_real_cunit.h 17 May 2009 15:53:25 -0000 1.2
@@ -3,7 +3,11 @@
#include <CUnit/Basic.h>
+/* START_INCLUDE_H */
+/* END_INCLUDE_H */
-CU_pSuite gsb_real_cunit_create_suite();
+/* START_DECLARATION */
+CU_pSuite gsb_real_cunit_create_suite ( void );
+/* END_DECLARATION */
#endif//_GSB_REAL_CUNIT_H
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.32, 1.33 da.po, 1.39, 1.40 de.po, 1.84, 1.85 el.po, 1.3, 1.4 es.po, 1.77, 1.78 fa.po, 1.26, 1.27 fr.po, 1.156, 1.157 grisbi.pot, 1.74, 1.75 he.po, 1.32, 1.33 it.po, 1.32, 1.33 nl.po, 1.31, 1.32 pl.po, 1.37, 1.38 pt_BR.po, 1.34, 1.35 ro.po, 1.32, 1.33 ru.po, 1.31, 1.32 zh_CN.po, 1.26, 1.27
- Next message: [grisbi-cvs] grisbi/src gsb_account_property.c,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list