[grisbi-cvs] [SCM] grisbi branch, master, updated. 1810022180c918413df213f094a7e8da5c18f9b5
Pierre Biava
nobody at users.sourceforge.net
Sat Aug 7 23:49:07 CEST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 1810022180c918413df213f094a7e8da5c18f9b5 (commit)
via f291e6f4ef2e255810ab58cdc711ca3485858888 (commit)
via 7506eead84636634685cd23013f3df2c64afe9b8 (commit)
via d67aa87bb69b889489a984ff2e08877f3d787f9c (commit)
via cc6804a11dfdf4ef33530c75b78348fb929fcf15 (commit)
via 19c42c15b37e823c6fc6f6a9b99b89ff6cef6e9d (commit)
from 958340ec3961baea3c6031636bcd24da42f69c86 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1810022180c918413df213f094a7e8da5c18f9b5
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Aug 7 23:48:04 2010 +0200
Update file doxygen.conf and the documentation
commit f291e6f4ef2e255810ab58cdc711ca3485858888
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Aug 7 22:09:09 2010 +0200
fixed bug 1144
commit 7506eead84636634685cd23013f3df2c64afe9b8
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Aug 5 23:25:11 2010 +0200
Go back on the deletion of the definition of lldiv_t
commit d67aa87bb69b889489a984ff2e08877f3d787f9c
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Aug 5 22:14:29 2010 +0200
update strings
commit cc6804a11dfdf4ef33530c75b78348fb929fcf15
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Aug 5 21:49:48 2010 +0200
fix bug 1145
commit 19c42c15b37e823c6fc6f6a9b99b89ff6cef6e9d
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Aug 5 21:19:52 2010 +0200
adaptation of the code to meet ansi (C89)
-----------------------------------------------------------------------
Changes:
diff --git a/configure.in b/configure.in
index 4ca74e3..fb6438f 100644
--- a/configure.in
+++ b/configure.in
@@ -170,7 +170,7 @@ AC_ARG_ENABLE(werror,
enable_werror=no)
if test "x$enable_werror" = xyes ; then
if test "x$GCC" = "xyes" ; then
- CFLAGS="$CFLAGS -Wall -Wunused -Wno-unused-parameter -Wno-unused-function"
+ CFLAGS="$CFLAGS -ansi -Wall -Wunused -Wno-unused-parameter -Wno-unused-function"
AC_MSG_WARN([Wall and Wunused flags are enabled])
else
AC_MSG_WARN([Wall and Wunused can be enabled only with gcc])
diff --git a/doxygen.conf b/doxygen.conf
index 6c09dbb..821cfaf 100644
--- a/doxygen.conf
+++ b/doxygen.conf
@@ -30,7 +30,7 @@ PROJECT_NUMBER = 0.6.0
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = /home/grisbi/doxygen
+OUTPUT_DIRECTORY = doxygen
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
# documentation generated by doxygen is written. Doxygen will use this
diff --git a/po/fr.po b/po/fr.po
index bba1bc4..d81ce24 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-01 00:39+0200\n"
+"POT-Creation-Date: 2010-08-05 21:48+0200\n"
"PO-Revision-Date: 2010-05-02 23:26+0200\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -695,29 +695,21 @@ msgstr "Taux actuariel"
msgid "Proportional rate"
msgstr "Taux proportionnel"
-#. ~ g_signal_connect ( button_1,
-#. ~ "released",
-#. ~ G_CALLBACK ( bet_finance_type_taux_changed ),
-#. ~ parent );
-#. ~ g_signal_connect ( button_2,
-#. ~ "released",
-#. ~ G_CALLBACK ( bet_finance_type_taux_changed ),
-#. ~ parent );
-#: ../src/bet_config.c:1291
+#: ../src/bet_config.c:1283
msgid "Apply"
msgstr "Appliquer"
-#: ../src/bet_config.c:1344 ../src/bet_finance_ui.c:761
+#: ../src/bet_config.c:1336 ../src/bet_finance_ui.c:761
#: ../src/bet_finance_ui.c:1507
msgid " year "
msgstr " an "
-#: ../src/bet_config.c:1346 ../src/bet_finance_ui.c:763
+#: ../src/bet_config.c:1338 ../src/bet_finance_ui.c:763
#: ../src/bet_finance_ui.c:1509
msgid " years "
msgstr " ans "
-#: ../src/bet_config.c:1396 ../src/bet_finance_ui.c:627
+#: ../src/bet_config.c:1388 ../src/bet_finance_ui.c:627
msgid "You must enter at least one value for the capital"
msgstr "Vous devez entrer au moins une valeur pour le capital"
@@ -888,6 +880,7 @@ msgid "Weekly"
msgstr "Hebdomadaire"
#: ../src/bet_future.c:313 ../src/gsb_form_scheduler.c:152
+#: ../src/gsb_scheduler_list.c:998
msgid "Monthly"
msgstr "Mensuel"
@@ -1101,7 +1094,7 @@ msgstr "Moyenne"
msgid "Amount retained"
msgstr "Montant retenu"
-#. ~ devel_debug (NULL);
+#. devel_debug (NULL);
#. the fyear list store, contains 3 columns :
#. * FYEAR_COL_NAME : the name of the fyear
#. * FYEAR_COL_NUMBER : the number of the fyear
@@ -7531,15 +7524,15 @@ msgstr ""
msgid "Cannot open config file '%s': %s"
msgstr "Impossible d'ouvrir le fichier de configuration « %s » : %s"
-#: ../src/gsb_file_config.c:1398 ../src/print_config.c:51
+#: ../src/gsb_file_config.c:1375 ../src/print_config.c:51
msgid "A4"
msgstr "A4"
-#: ../src/gsb_file_config.c:1417
+#: ../src/gsb_file_config.c:1394
msgid "Delete config file from a previous version"
msgstr "Supprimer la copie du fichier de la version précédente de grisbi"
-#: ../src/gsb_file_config.c:1437
+#: ../src/gsb_file_config.c:1414
msgid ""
"Caution, you are about to delete the\n"
"configuration file of a previous version of Grisbi.\n"
@@ -7551,11 +7544,11 @@ msgstr ""
"\n"
"<b>Voulez-vous le supprimer ?</b>"
-#: ../src/gsb_file_config.c:1501
+#: ../src/gsb_file_config.c:1478
msgid "Choose a file"
msgstr "Choisir un fichier"
-#: ../src/gsb_file_config.c:1524
+#: ../src/gsb_file_config.c:1501
msgid ""
"Please Choose the name of file\n"
"of configuration.\n"
@@ -7904,53 +7897,53 @@ msgstr ""
msgid "Configure the form"
msgstr "Configurer le formulaire"
-#: ../src/gsb_form_config.c:116 ../src/parametres.c:442
+#: ../src/gsb_form_config.c:113 ../src/parametres.c:442
msgid "Transaction form"
msgstr "Formulaire des opérations"
#. create the paddingbox into the parent
-#: ../src/gsb_form_config.c:149
+#: ../src/gsb_form_config.c:144
msgid "Form structure preview"
msgstr "Prévisualisation de la structure du formulaire"
#. set the box with the buttons
-#: ../src/gsb_form_config.c:178
+#: ../src/gsb_form_config.c:173
msgid "Form structure content"
msgstr "Contenu de la structure du formulaire"
-#: ../src/gsb_form_config.c:225
+#: ../src/gsb_form_config.c:220
msgid "Col 1"
msgstr "Col 1"
-#: ../src/gsb_form_config.c:226
+#: ../src/gsb_form_config.c:221
msgid "Col 2"
msgstr "Col 2"
-#: ../src/gsb_form_config.c:227
+#: ../src/gsb_form_config.c:222
msgid "Col 3"
msgstr "Col 3"
-#: ../src/gsb_form_config.c:228
+#: ../src/gsb_form_config.c:223
msgid "Col 4"
msgstr "Col 4"
-#: ../src/gsb_form_config.c:229
+#: ../src/gsb_form_config.c:224
msgid "Col 5"
msgstr "Col 5"
-#: ../src/gsb_form_config.c:230
+#: ../src/gsb_form_config.c:225
msgid "Col 6"
msgstr "Col 6"
-#: ../src/gsb_form_config.c:342
+#: ../src/gsb_form_config.c:337
msgid "rows"
msgstr "lignes"
-#: ../src/gsb_form_config.c:389
+#: ../src/gsb_form_config.c:384
msgid "columns"
msgstr "colonnes"
-#: ../src/gsb_form_config.c:693
+#: ../src/gsb_form_config.c:667
msgid ""
"There is no place enough to put the element. You need to increase the number "
"of rows or columns to add an element."
@@ -7958,11 +7951,11 @@ msgstr ""
"Il n'y a pas assez de place pour mettre l'élément. Vous devez augmenter le "
"nombre de lignes ou de colonnes pour ajouter un élément supplémentaire."
-#: ../src/gsb_form_config.c:694 ../src/gsb_form_config.c:697
+#: ../src/gsb_form_config.c:668 ../src/gsb_form_config.c:671
msgid "The table is full"
msgstr "La table est pleine"
-#: ../src/gsb_form_config.c:696
+#: ../src/gsb_form_config.c:670
msgid ""
"There is no place enough to put the two elements (you have clicked on an "
"element which contains two). You need to increase the number of rows or "
@@ -8390,10 +8383,6 @@ msgstr "%d mois"
msgid "%d years"
msgstr "%d ans"
-#: ../src/gsb_scheduler_list.c:998
-msgid "Montly"
-msgstr "Mensuel"
-
#: ../src/gsb_scheduler_list.c:1647
#, c-format
msgid ""
@@ -8720,7 +8709,7 @@ msgid "ask for the sort number %d which doesn't exist... return by date"
msgstr ""
"Demande pour un numéro de tri : %d qui n'existe pas... retour au tri par date"
-#: ../src/gtk_combofix.c:992
+#: ../src/gtk_combofix.c:989
msgid ""
"You cannot create new payee or category and subcategory without changing the "
"options in preferences"
@@ -8728,7 +8717,7 @@ msgstr ""
"Vous ne pouvez pas créer de nouveau tiers ou catégorie sous-catégorie sans "
"modifier l'option correspondante dans les préférences"
-#: ../src/gtk_combofix.c:995
+#: ../src/gtk_combofix.c:992
msgid "Warning you cannot create payee or category"
msgstr "Attention vous ne pouvez pas créer de tiers ou de catégorie"
@@ -11054,6 +11043,3 @@ msgstr "Aucune police définie"
#: ../share/grisbi.desktop.in.h:2
msgid "Personnal finances manager"
msgstr "Gestionnaire de finances personnelles"
-
-#~ msgid "Credit Calculator and Amortization"
-#~ msgstr "Simulateur de crédit et d'amortissement"
diff --git a/src/affichage_liste.c b/src/affichage_liste.c
index ae6ab05..7569a48 100644
--- a/src/affichage_liste.c
+++ b/src/affichage_liste.c
@@ -524,11 +524,11 @@ GtkWidget *onglet_form_completion ( void )
G_CALLBACK ( gsb_transactions_list_display_update_combofix), NULL),
FALSE, FALSE, 0 );
- //~ gtk_box_pack_start ( GTK_BOX (vbox_pref),
- //~ gsb_automem_checkbutton_new (_("Enter keeps current completion"),
- //~ &etat.combofix_enter_select_completion,
- //~ G_CALLBACK ( gsb_transactions_list_display_update_combofix), NULL),
- //~ FALSE, FALSE, 0 );
+/* gtk_box_pack_start ( GTK_BOX (vbox_pref),
+ gsb_automem_checkbutton_new (_("Enter keeps current completion"),
+ &etat.combofix_enter_select_completion,
+ G_CALLBACK ( gsb_transactions_list_display_update_combofix), NULL),
+ FALSE, FALSE, 0 ); */
gtk_box_pack_start ( GTK_BOX (vbox_pref),
gsb_automem_checkbutton_new (_("Don't allow new payee creation"),
@@ -595,8 +595,8 @@ gboolean gsb_transactions_list_display_update_combofix ( void )
etat.combofix_max_item );
gtk_combofix_set_case_sensitive ( GTK_COMBOFIX (combofix),
etat.combofix_case_sensitive );
- //~ gtk_combofix_set_enter_function ( GTK_COMBOFIX (combofix),
- //~ etat.combofix_enter_select_completion );
+/* gtk_combofix_set_enter_function ( GTK_COMBOFIX (combofix),
+ etat.combofix_enter_select_completion );*/
}
combofix = gsb_form_widget_get_widget ( TRANSACTION_FORM_CATEGORY );
@@ -608,8 +608,8 @@ gboolean gsb_transactions_list_display_update_combofix ( void )
etat.combofix_max_item );
gtk_combofix_set_case_sensitive ( GTK_COMBOFIX (combofix),
etat.combofix_case_sensitive );
- //~ gtk_combofix_set_enter_function ( GTK_COMBOFIX (combofix),
- //~ etat.combofix_enter_select_completion );
+/* gtk_combofix_set_enter_function ( GTK_COMBOFIX (combofix),
+ etat.combofix_enter_select_completion ); */
gtk_combofix_set_mixed_sort ( GTK_COMBOFIX (combofix),
etat.combofix_mixed_sort );
}
@@ -623,8 +623,6 @@ gboolean gsb_transactions_list_display_update_combofix ( void )
etat.combofix_max_item );
gtk_combofix_set_case_sensitive ( GTK_COMBOFIX (combofix),
etat.combofix_case_sensitive );
- //~ gtk_combofix_set_enter_function ( GTK_COMBOFIX (combofix),
- //~ etat.combofix_enter_select_completion );
gtk_combofix_set_mixed_sort ( GTK_COMBOFIX (combofix),
etat.combofix_mixed_sort );
}
diff --git a/src/bet_config.c b/src/bet_config.c
index 95f0e59..c4eb5e0 100644
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@ -139,7 +139,7 @@ GtkWidget *bet_config_general_get_period_widget ( GtkWidget *container )
GtkSizeGroup *size_group;
gchar *text;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
size_group = gtk_size_group_new ( GTK_SIZE_GROUP_HORIZONTAL );
vbox = gtk_vbox_new ( FALSE, 5 );
@@ -1279,14 +1279,6 @@ GtkWidget *bet_config_get_finance_widget ( GtkWidget *parent )
gtk_box_pack_start ( GTK_BOX ( hbox ), button_1, FALSE, FALSE, 5) ;
gtk_box_pack_start ( GTK_BOX ( hbox ), button_2, FALSE, FALSE, 5) ;
- //~ g_signal_connect ( button_1,
- //~ "released",
- //~ G_CALLBACK ( bet_finance_type_taux_changed ),
- //~ parent );
- //~ g_signal_connect ( button_2,
- //~ "released",
- //~ G_CALLBACK ( bet_finance_type_taux_changed ),
- //~ parent );
button = gtk_button_new_with_label ( _("Apply") );
gtk_button_set_relief ( GTK_BUTTON ( button ), GTK_RELIEF_NONE );
@@ -1314,7 +1306,7 @@ void bet_config_initialise_finance_widget ( gint account_number,
gint nbre_ans;
gdouble taux;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
parent = g_object_get_data ( G_OBJECT ( notebook ), "Data_for_credit" );
/* get devise */
devise = gsb_data_account_get_currency ( account_number );
diff --git a/src/bet_data_finance.c b/src/bet_data_finance.c
index 45de4ee..609e377 100644
--- a/src/bet_data_finance.c
+++ b/src/bet_data_finance.c
@@ -78,7 +78,7 @@ gdouble bet_data_finance_get_taux_periodique ( gdouble taux, gint type_taux )
if ( type_taux )
taux_periodique = ( taux / 100 ) / 12;
else
- //~ taux_periodique = pow ( 1 + ( taux / 100 ), (1/12) ) - 1;
+ /* taux_periodique = pow ( 1 + ( taux / 100 ), (1/12) ) - 1; */
taux_periodique = 0.004868;
return taux_periodique;
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index d64cdfd..b58bda7 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -220,9 +220,9 @@ GtkWidget *bet_finance_create_simulator_page ( void )
completion = gtk_entry_completion_new ( );
widget = gtk_entry_new ( );
gtk_entry_set_completion ( GTK_ENTRY ( widget ), completion );
- //~ printf ("nbre de caractères avant completion =%d\n",
- //~ gtk_entry_completion_get_minimum_key_length (completion));
- //~ gtk_entry_set_text ( GTK_ENTRY ( widget ), "177000" );
+ /* printf ("nbre de caractères avant completion =%d\n",
+ gtk_entry_completion_get_minimum_key_length ( completion ) ); */
+ gtk_entry_set_text ( GTK_ENTRY ( widget ), "10000" );
g_object_set_data ( G_OBJECT ( page ), "capital", widget );
gtk_box_pack_start ( GTK_BOX ( hbox ), widget, FALSE, FALSE, 5 );
g_signal_connect ( G_OBJECT ( widget ),
@@ -242,7 +242,7 @@ GtkWidget *bet_finance_create_simulator_page ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 5 );
spin_button = gtk_spin_button_new_with_range ( 0.0, 100, 0.01);
- //~ gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( spin_button ), 3.80);
+ gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( spin_button ), 4.0);
g_object_set_data ( G_OBJECT ( page ), "taux", spin_button );
gtk_box_pack_start ( GTK_BOX ( hbox ), spin_button, FALSE, FALSE, 0 );
@@ -367,7 +367,7 @@ GtkWidget *bet_finance_create_saisie_widget ( GtkWidget *parent )
gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 5 );
spin_button = gtk_spin_button_new_with_range ( 0.0, 100, 0.01 );
- //~ gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( spin_button ), 6.96 );
+ gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( spin_button ), 0.35 );
g_object_set_data ( G_OBJECT ( parent ), "frais", spin_button );
gtk_box_pack_start ( GTK_BOX ( hbox ), spin_button, FALSE, FALSE, 0 );
@@ -1458,7 +1458,7 @@ void bet_finance_ui_update_amortization_tab ( gint account_number )
GDate *last_paid_date;
struct_amortissement *s_amortissement;
- //~ devel_debug ( NULL );
+ /* devel_debug ( NULL ); */
if ( gsb_gui_navigation_get_current_account ( ) != account_number )
return;
diff --git a/src/bet_future.c b/src/bet_future.c
index a71969f..cd663ce 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -73,8 +73,8 @@ static gboolean bet_form_create_current_form ( GtkWidget *dialog,
gint account_number );
static gboolean bet_form_create_scheduler_part ( GtkWidget *dialog, GtkWidget *table );
static gboolean bet_form_entry_get_focus ( GtkWidget *entry,
- GdkEventFocus *ev,
- GtkWidget *dialog );
+ GdkEventFocus *ev,
+ GtkWidget *dialog );
static gboolean bet_form_entry_lose_focus ( GtkWidget *entry,
GdkEventFocus *ev,
gint *ptr_origin );
@@ -82,7 +82,7 @@ static gboolean bet_form_key_press_event ( GtkWidget *widget,
GdkEventKey *ev,
gint *ptr_origin );
static gboolean bet_form_scheduler_frequency_button_changed ( GtkWidget *combo_box,
- GtkWidget *dialog );
+ GtkWidget *dialog );
static GtkWidget *bet_form_scheduler_get_element_widget ( gint element_number );
static GtkWidget *bet_form_widget_get_widget ( gint element_number );
static GtkWidget *bet_future_create_dialog ( gint account_number );
@@ -95,7 +95,7 @@ static gboolean bet_future_get_category_data ( GtkWidget *widget,
static gboolean bet_future_set_form_data_from_line ( gint account_number,
gint number );
static gboolean bet_future_take_data_from_form ( struct_futur_data *scheduled );
-//~ static void bet_transfert_auto_inc_toggle ( GtkToggleButton *button, gpointer data );
+/* static void bet_transfert_auto_inc_toggle ( GtkToggleButton *button, gpointer data ); */
static GtkWidget *bet_transfert_create_account_list_part ( GtkWidget *dialog, gint account_number );
static GtkWidget *bet_transfert_create_dialog ( gint account_number );
static gboolean bet_transfert_entry_lose_focus ( GtkWidget *entry,
@@ -846,7 +846,7 @@ gboolean bet_form_clean ( gint account_number )
* \return FALSE
* */
gboolean bet_form_scheduler_frequency_button_changed ( GtkWidget *combo_box,
- GtkWidget *dialog )
+ GtkWidget *dialog )
{
gchar *selected_item;
@@ -897,8 +897,8 @@ gboolean bet_form_scheduler_frequency_button_changed ( GtkWidget *combo_box,
* \return FALSE
* */
gboolean bet_form_entry_get_focus ( GtkWidget *entry,
- GdkEventFocus *ev,
- GtkWidget *dialog )
+ GdkEventFocus *ev,
+ GtkWidget *dialog )
{
/* the entry can be a combofix or a real entry */
if (GTK_IS_COMBOFIX ( entry ))
@@ -1961,10 +1961,10 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_auto_inc", button );
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
- //~ g_signal_connect ( G_OBJECT ( button ),
- //~ "toggled",
- //~ G_CALLBACK ( bet_transfert_auto_inc_toggle ),
- //~ NULL );
+ /* g_signal_connect ( G_OBJECT ( button ),
+ "toggled",
+ G_CALLBACK ( bet_transfert_auto_inc_toggle ),
+ NULL ); */
/* check button replace planned line */
button = gtk_check_button_new_with_label (
diff --git a/src/bet_hist.c b/src/bet_hist.c
index 6cc6b0e..c317702 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -225,7 +225,7 @@ gboolean bet_historical_div_toggle_clicked ( GtkCellRendererToggle *renderer,
{
GtkTreeIter iter;
- //~ devel_debug (path_string);
+ /* devel_debug (path_string); */
if ( gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL ( model ), &iter, path_string ) )
{
gchar *str_amount;
@@ -255,8 +255,8 @@ gboolean bet_historical_div_toggle_clicked ( GtkCellRendererToggle *renderer,
if ( valeur == 1 )
{
- //~ printf ("avant - account_number = %d, div = %d, sub_div = %d\n",
- //~ account_number, div, sub_div);
+ /* printf ("avant - account_number = %d, div = %d, sub_div = %d\n",
+ account_number, div, sub_div); */
bet_data_hist_add_div ( account_number, div_number, sub_div_nb );
bet_data_set_div_amount ( account_number, div_number, sub_div_nb,
gsb_real_import_from_string ( str_amount ) );
@@ -372,7 +372,7 @@ void bet_historical_div_cell_edited (GtkCellRendererText *cell,
GtkTreeModel *model;
GtkTreeIter iter;
- //~ devel_debug (new_text);
+ /* devel_debug (new_text); */
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
if ( gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL ( model ), &iter, path_string ) )
{
@@ -470,7 +470,7 @@ GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container )
GtkTreeViewColumn *column;
gchar *title;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
tree_view = gtk_tree_view_new ( );
gtk_tree_view_set_rules_hint ( GTK_TREE_VIEW (tree_view), TRUE);
g_object_set_data ( G_OBJECT ( account_page ), "hist_tree_view", tree_view );
@@ -715,7 +715,7 @@ void bet_historical_populate_data ( gint account_number )
}
bet_historical_affiche_div ( list_div, tree_view );
- //~ bet_data_synchronise_hist_div_list ( list_div );
+ /* bet_data_synchronise_hist_div_list ( list_div ); */
g_hash_table_remove_all ( list_div );
@@ -733,7 +733,7 @@ gboolean bet_historical_affiche_div ( GHashTable *list_div, GtkWidget *tree_vie
{
GtkTreeModel *model;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
g_hash_table_foreach ( list_div, bet_historical_populate_div_model, tree_view );
@@ -845,8 +845,8 @@ void bet_historical_populate_div_model ( gpointer key,
gchar **tab_str = NULL;
div_name = bet_data_get_div_name ( div_number, sub_sh -> div, NULL );
- //~ printf ("division = %d sub_div = %d div_name = %s\n",
- //~ div_number, sub_sh -> div, div_name);
+ /* printf ("division = %d sub_div = %d div_name = %s\n",
+ div_number, sub_sh -> div, div_name); */
if ( div_name && g_utf8_strrchr ( div_name, -1, ':' ) )
{
tab_str = g_strsplit ( div_name, ":", 2 );
@@ -885,7 +885,7 @@ void bet_historical_populate_div_model ( gpointer key,
{
if ( bet_data_get_div_edited ( account_nb, div_number, sub_sh -> div ) )
{
- //~ printf ("account_nb = %d div_number = %d sub_sh -> div = %d\n", account_nb, div_number, sub_sh -> div );
+ /* printf ("account_nb = %d div_number = %d sub_sh -> div = %d\n", account_nb, div_number, sub_sh -> div ); */
retained = bet_data_hist_get_div_amount ( account_nb, div_number, sub_sh -> div );
if ( str_amount )
g_free ( str_amount );
@@ -963,7 +963,7 @@ gboolean bet_historical_fyear_create_combobox_store ( void )
{
gchar *titre;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
/* the fyear list store, contains 3 columns :
* FYEAR_COL_NAME : the name of the fyear
* FYEAR_COL_NUMBER : the number of the fyear
@@ -998,7 +998,7 @@ gint bet_historical_get_fyear_from_combobox ( GtkWidget *combo_box )
gint fyear_number = 0;
GtkTreeIter iter;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
if ( !gtk_combo_box_get_active_iter ( GTK_COMBO_BOX ( combo_box ), &iter ) )
return 0;
@@ -1451,7 +1451,7 @@ void bet_historical_add_last_amount ( GtkWidget *menu_item,
currency_number = gsb_data_account_get_currency ( account_number );
tmp_str = gsb_real_get_string_with_currency ( amount, currency_number, TRUE );
- //~ printf ("div = %d sub_div_nb = %d tmp_str = %s\n", div_number, sub_div_nb, tmp_str);
+ /* printf ("div = %d sub_div_nb = %d tmp_str = %s\n", div_number, sub_div_nb, tmp_str); */
if ( bet_data_search_div_hist ( account_number, div_number, sub_div_nb ) == FALSE )
bet_data_hist_add_div ( account_number, div_number, sub_div_nb );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 0a25bc5..00f810a 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -703,7 +703,7 @@ void bet_array_refresh_scheduled_data ( GtkTreeModel *tab_model,
GtkTreeIter iter;
GSList* tmp_list;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
tmp_list = gsb_data_scheduled_get_scheduled_list ( );
while (tmp_list)
@@ -856,7 +856,7 @@ void bet_array_refresh_transactions_data ( GtkTreeModel *tab_model,
GDate *date_comp;
GSList *tmp_list;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
/* init dates */
date_jour_1 = gdate_today ( );
if ( g_date_get_day ( date_min ) > 1 )
@@ -1013,7 +1013,7 @@ void bet_array_list_add_new_hist_line ( GtkTreeModel *tab_model,
gint sub_div_nb;
gsb_real amount;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
date_jour = gdate_today ( );
date = gsb_date_get_last_day_of_month ( date_min );
@@ -1108,7 +1108,7 @@ gboolean bet_array_refresh_futur_data ( GtkTreeModel *tab_model,
gpointer key, value;
gint account_number;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
account_number = gsb_gui_navigation_get_current_account ( );
future_list = bet_data_future_get_list ( );
@@ -1998,7 +1998,7 @@ gboolean bet_array_initializes_account_settings ( gint account_number )
gint param;
gint months;
- //~ devel_debug_int ( account_number );
+ /* devel_debug_int ( account_number ); */
button = g_object_get_data ( G_OBJECT ( account_page ), "bet_account_spin_button" );
param = gsb_data_account_get_bet_spin_range ( account_number );
diff --git a/src/export_csv.c b/src/export_csv.c
index cd72c9b..95f5ef4 100644
--- a/src/export_csv.c
+++ b/src/export_csv.c
@@ -589,7 +589,7 @@ static gboolean gsb_csv_export_transaction ( gint transaction_number,
{
/* on commence par mettre la catég et sous categ de l'opé et de l'opé de ventilation */
CSV_CLEAR_FIELD (csv_field_ventil);
- csv_field_ventil = my_strdup (_("B")); // -> mark
+ csv_field_ventil = my_strdup (_("B")); /* -> mark */
CSV_CLEAR_FIELD (csv_field_operation);
csv_field_operation = g_strdup_printf("%d", pSplitTransaction );
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index 0c13d67..b197be8 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -313,7 +313,7 @@ gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
{
gint account_number;
- //~ devel_debug_int (page_number);
+ /* devel_debug_int (page_number); */
switch ( page_number )
{
case GSB_TRANSACTIONS_PAGE:
diff --git a/src/gsb_data_account.c b/src/gsb_data_account.c
index a8e4868..0064f9f 100644
--- a/src/gsb_data_account.c
+++ b/src/gsb_data_account.c
@@ -1038,7 +1038,7 @@ gsb_real gsb_data_account_calculate_current_and_marked_balances ( gint account_n
gsb_real marked_balance_later = null_real;
gint floating_point;
- //~ devel_debug_int ( account_number );
+ /* devel_debug_int ( account_number ); */
account = gsb_data_account_get_structure ( account_number );
if ( !account )
diff --git a/src/gsb_data_form.h b/src/gsb_data_form.h
index 08ec84f..0706017 100644
--- a/src/gsb_data_form.h
+++ b/src/gsb_data_form.h
@@ -10,22 +10,22 @@ enum transaction_form_widget {
TRANSACTION_FORM_DEBIT,
TRANSACTION_FORM_CREDIT,
TRANSACTION_FORM_VALUE_DATE,
- TRANSACTION_FORM_EXERCICE,
+ TRANSACTION_FORM_EXERCICE, /* 5 */
TRANSACTION_FORM_PARTY,
TRANSACTION_FORM_CATEGORY,
- TRANSACTION_FORM_FREE, /* free for the moment, to be filled with a new thing */
+ TRANSACTION_FORM_FREE, /* free for the moment, to be filled with a new thing */
TRANSACTION_FORM_BUDGET,
- TRANSACTION_FORM_NOTES,
+ TRANSACTION_FORM_NOTES, /* 10 */
TRANSACTION_FORM_TYPE,
- TRANSACTION_FORM_CHEQUE,
+ TRANSACTION_FORM_CHEQUE, /* 12 */
TRANSACTION_FORM_DEVISE,
TRANSACTION_FORM_CHANGE,
- TRANSACTION_FORM_VOUCHER,
+ TRANSACTION_FORM_VOUCHER, /* 15 */
TRANSACTION_FORM_BANK,
TRANSACTION_FORM_CONTRA,
TRANSACTION_FORM_OP_NB,
TRANSACTION_FORM_MODE,
- TRANSACTION_FORM_WIDGET_NB,
+ TRANSACTION_FORM_WIDGET_NB, /* 20 */
TRANSACTION_FORM_MAX_WIDGETS,
};
diff --git a/src/gsb_data_transaction.c b/src/gsb_data_transaction.c
index b6d8d3f..b8b9d33 100644
--- a/src/gsb_data_transaction.c
+++ b/src/gsb_data_transaction.c
@@ -763,8 +763,8 @@ gsb_real gsb_data_transaction_get_adjusted_amount_for_currency ( gint transactio
if ( transaction -> currency_number == return_currency_number )
return gsb_real_adjust_exponent ( transaction -> transaction_amount,
return_exponent );
-//~ printf ("get_adjusted_amount transaction_number = %d transaction -> currency_number = %d return_currency_number = %d\n",
- //~ transaction_number, transaction -> currency_number, return_currency_number);
+/* printf ("get_adjusted_amount transaction_number = %d transaction -> currency_number = %d return_currency_number = %d\n",
+ transaction_number, transaction -> currency_number, return_currency_number); */
/* now we can adjust the amount */
/* the exchange is saved in the transaction itself */
if ( transaction -> exchange_rate.mantissa )
diff --git a/src/gsb_file.c b/src/gsb_file.c
index 3bb3424..736c9e0 100644
--- a/src/gsb_file.c
+++ b/src/gsb_file.c
@@ -30,8 +30,8 @@
# include <realpath.h>
# else
# include <stdlibx.h> // For realpath()
-# endif//_MSC_VER
-#endif//_WIN32
+# endif /*_MSC_VER */
+#endif /* _WIN32 */
/*START_INCLUDE*/
#include "gsb_file.h"
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index e6f9a30..69d28f9 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -1360,31 +1360,8 @@ void gsb_file_config_clean_config ( void )
conf.latex_command = "latex";
conf.dvips_command = "dvips";
-/* mise en conformité avec les recommandations FreeDesktop. */
-//~ #ifndef _WIN32
- //~ if ( g_file_test ( "/usr/bin/firefox", G_FILE_TEST_EXISTS ) )
- //~ {
- //~ conf.browser_command = g_strdup ( "/usr/bin/firefox" );
- //~ }
- //~ else if ( g_file_test ( "/usr/bin/iceweasel", G_FILE_TEST_EXISTS ) )
- //~ {
- //~ conf.browser_command = g_strdup ( "/usr/bin/iceweasel" );
- //~ }
- //~ else if ( g_file_test ( "/usr/bin/opera", G_FILE_TEST_EXISTS ) )
- //~ {
- //~ conf.browser_command = g_strdup ( "/usr/bin/opera" );
- //~ }
- //~ else if ( g_file_test ( "/usr/bin/mozilla", G_FILE_TEST_EXISTS ) )
- //~ {
- //~ conf.browser_command = g_strdup ( "/usr/bin/mozilla" );
- //~ }
- //~ else
- //~ {
-//~ #endif /* _WIN32 */
+ /* mise en conformité avec les recommandations FreeDesktop. */
conf.browser_command = g_strdup (ETAT_WWW_BROWSER);
-//~ #ifndef _WIN32
- //~ }
-//~ #endif /* _WIN32 */
/* Print */
etat.print_config.printer = 0;
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index eeaf2a9..0438dcb 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -26,7 +26,7 @@
#include <glib/gstdio.h>
#if GLIB_CHECK_VERSION (2,18,0)
#include <gio/gio.h>
-#endif//GLIB_CHECK_VERSION (2,18,0)
+#endif /* GLIB_CHECK_VERSION (2,18,0) */
/*START_INCLUDE*/
@@ -5551,8 +5551,8 @@ void gsb_file_load_start_element_before_0_6 ( GMarkupParseContext *context,
tmp_string = utils_str_reduce_exponant_from_string ( attribute_values[i], 2 );
number = gsb_real_get_from_string (tmp_string);
- //~ printf ("tmp_string = %s number.mantissa = %ld number.exponent = %d\n", tmp_string,
- //~ number.mantissa, number.exponent);
+ /* printf ("tmp_string = %s number.mantissa = %ld number.exponent = %d\n", tmp_string,
+ number.mantissa, number.exponent); */
gsb_data_transaction_set_amount ( transaction_number,
gsb_real_get_from_string (tmp_string));
if (tmp_string) g_free (tmp_string);
@@ -6877,15 +6877,15 @@ void gsb_file_load_account_part_before_0_6 ( GMarkupParseContext *context,
gsb_real number;
tmp_string = utils_str_reduce_exponant_from_string ( text, 2 );
- //~ printf ("solde_initial = %s\n", tmp_string );
+ /* printf ("solde_initial = %s\n", tmp_string ); */
number = gsb_real_get_from_string ( tmp_string );
if ( number.mantissa == error_real.mantissa )
gsb_data_account_set_init_balance ( account_number, null_real );
else
gsb_data_account_set_init_balance ( account_number, number );
- //~ printf ("tmp_string = %s number.mantissa = %ld number.exponent = %d initial_balance = %s\n", tmp_string,
- //~ number.mantissa, number.exponent,
- //~ gsb_real_get_string ( gsb_data_account_get_init_balance ( account_number, 2)));
+ /* printf ("tmp_string = %s number.mantissa = %ld number.exponent = %d initial_balance = %s\n", tmp_string,
+ number.mantissa, number.exponent,
+ gsb_real_get_string ( gsb_data_account_get_init_balance ( account_number, 2))); */
if (tmp_string)
g_free (tmp_string);
@@ -8941,7 +8941,7 @@ void gsb_file_load_copy_old_file ( gchar *filename, gchar *file_content)
#if GLIB_CHECK_VERSION (2,18,0)
GFile * file_ori;
GFile * file_copy;
-#endif//GLIB_CHECK_VERSION (2,18,0)
+#endif /* GLIB_CHECK_VERSION (2,18,0) */
GError * error = NULL;
copy_old_filename = g_path_get_basename ( filename );
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 8ca53c6..b580ea5 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -28,7 +28,7 @@
#include "include.h"
#ifdef _MSC_VER
# include <io.h> // for _chmod()
-#endif//_MSC_VER
+#endif /*_MSC_VER */
#include <zlib.h>
/*START_INCLUDE*/
@@ -469,7 +469,7 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
_chmod ( filename, _S_IREAD | _S_IWRITE );
#else
chmod ( filename, S_IRUSR | S_IWUSR );
-#endif//_MSC_VER
+#endif /*_MSC_VER */
}
else
{
@@ -487,7 +487,7 @@ gboolean gsb_file_save_save_file ( const gchar *filename,
/* we couldn't set the chmod, set the default permission */
chmod ( filename, S_IRUSR | S_IWUSR );
}
-#endif//_MSC_VER
+#endif /*_MSC_VER */
}
etat.en_train_de_sauvegarder = 0;
diff --git a/src/gsb_file_util.c b/src/gsb_file_util.c
index d658734..1026ffe 100644
--- a/src/gsb_file_util.c
+++ b/src/gsb_file_util.c
@@ -142,7 +142,7 @@ gboolean gsb_file_util_get_contents ( gchar *filename,
/* the file is not compressed, keep the original size */
alloc_size = orig_size + 1;
else
-#endif//_WIN32
+#endif /*_MSC_VER */
/* the file is compressed, the final size should be about 20x more
* this is not completly true, if the file is compressed AND crypted,
* the size doesn't really change. but i can't know here if the file is crypted
diff --git a/src/gsb_form.c b/src/gsb_form.c
index 908d959..dad8d85 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -1458,6 +1458,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
gchar *string;
gint element_number;
GtkWidget *widget;
+ GtkWidget *tmp_widget;
gint account_number;
gint transaction_number;
gint payment_number;
@@ -1545,11 +1546,10 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
/* si pas de nouveau débit on essaie de remettre l'ancien crédit */
if ( (string = gsb_form_widget_get_old_credit ( ) ) )
{
- GtkWidget * widget_prov = gsb_form_widget_get_widget (
- TRANSACTION_FORM_CREDIT );
+ tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CREDIT );
- gtk_entry_set_text ( GTK_ENTRY ( widget_prov ), string );
- gsb_form_widget_set_empty ( widget_prov, FALSE );
+ gtk_entry_set_text ( GTK_ENTRY ( tmp_widget ), string );
+ gsb_form_widget_set_empty ( tmp_widget, FALSE );
g_free ( string );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
@@ -1561,21 +1561,23 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_DEBIT )
{
if ( transaction_number == -1 )
- payment_number = gsb_form_widget_get_old_credit_payment ( );
+ payment_number = gsb_form_widget_get_old_credit_payment_number ( );
else
payment_number = gsb_data_transaction_get_method_of_payment_number (
- transaction_number );
+ transaction_number );
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_CREDIT,
account_number, 0 );
gsb_payment_method_set_payment_position ( widget, payment_number );
- /* if there is no payment method, the last function hide it, but we have
- * to hide the cheque element too */
- if ( !GTK_WIDGET_VISIBLE (widget))
- gtk_widget_hide (gsb_form_widget_get_widget (
- TRANSACTION_FORM_CHEQUE ) );
+ widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
+ if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ {
+ gtk_entry_set_text ( GTK_ENTRY ( widget ),
+ gsb_form_widget_get_old_credit_payment_content ( ) );
+ gsb_form_widget_set_empty ( widget, FALSE );
+ }
widget = gsb_form_widget_get_widget (TRANSACTION_FORM_CONTRA);
if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
@@ -1594,7 +1596,7 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
/* we change the payment method to adapt it for the debit */
if ( strlen ( gtk_entry_get_text ( GTK_ENTRY (entry))))
{
- /* empty the credit */
+ /* empty the debit */
widget = gsb_form_widget_get_widget (TRANSACTION_FORM_DEBIT);
if (!gsb_form_widget_check_empty (widget))
{
@@ -1635,11 +1637,10 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
/* si pas de nouveau credit on essaie de remettre l'ancien débit */
if ( (string = gsb_form_widget_get_old_debit ( ) ) )
{
- GtkWidget * widget_prov = gsb_form_widget_get_widget (
- TRANSACTION_FORM_DEBIT );
+ tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_DEBIT );
- gtk_entry_set_text ( GTK_ENTRY ( widget_prov ), string );
- gsb_form_widget_set_empty ( widget_prov, FALSE );
+ gtk_entry_set_text ( GTK_ENTRY ( tmp_widget ), string );
+ gsb_form_widget_set_empty ( tmp_widget, FALSE );
g_free ( string );
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE );
@@ -1651,22 +1652,24 @@ gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
{
if ( transaction_number == -1 )
- payment_number = gsb_form_widget_get_old_debit_payment ( );
+ payment_number = gsb_form_widget_get_old_debit_payment_number ( );
else
payment_number = gsb_data_transaction_get_method_of_payment_number (
- transaction_number );
+ transaction_number );
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_DEBIT,
account_number, 0 );
gsb_payment_method_set_payment_position ( widget, payment_number );
-
- /* if there is no payment method, the last function hide it, but we have
- * to hide the cheque element too */
- if ( !GTK_WIDGET_VISIBLE ( widget ) )
- gtk_widget_hide (gsb_form_widget_get_widget (
- TRANSACTION_FORM_CHEQUE ) );
+ widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
+ if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
+ {
+ gtk_entry_set_text ( GTK_ENTRY ( widget ),
+ gsb_form_widget_get_old_debit_payment_content ( ) );
+ gsb_form_widget_set_empty ( widget, FALSE );
+ }
+
widget = gsb_form_widget_get_widget (TRANSACTION_FORM_CONTRA);
if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
gsb_payment_method_create_combo_list ( gsb_form_widget_get_widget (
diff --git a/src/gsb_form_config.c b/src/gsb_form_config.c
index 5b66c99..da8eb26 100644
--- a/src/gsb_form_config.c
+++ b/src/gsb_form_config.c
@@ -93,9 +93,6 @@ static GtkWidget *form_config_buttons[TRANSACTION_FORM_WIDGET_NB-3];
/** the option menu which contains all the accounts, to configure the form */
static GtkWidget *accounts_combobox;
-/** the button to update all the accounts forms */
-//~ static GtkWidget *update_button;
-
/** the tree view */
static GtkWidget *form_config_tree_view;
@@ -140,10 +137,8 @@ void gsb_form_config_make_configuration_box ( GtkWidget *vbox_parent )
{
GtkWidget *sw;
GtkWidget *hbox;
- //~ GtkWidget *button;
GtkWidget *paddingbox;
- //~ GtkWidget *label;
- GtkListStore* list_store;
+ GtkListStore* list_store;
/* create the paddingbox into the parent */
paddingbox = new_paddingbox_with_title ( vbox_parent, TRUE, _("Form structure preview"));
@@ -543,27 +538,6 @@ gboolean gsb_form_config_change_account_choice ( GtkWidget *combobox,
/**
- * callback for update all the accounts forms organization
- * according to the selected account
- *
- * \param button the update_button
- * \param null the combobox of accounts
- *
- * \return FALSE
- * */
-//~ static gboolean gsb_form_config_update_accounts ( GtkWidget *button,
- //~ GtkWidget *combobox )
-//~ {
- //~ if (!question_yes_no (_("Warning : all the form of the accounts will be updated according to the selected account. All the changes in the other accounts will be overwritten.\n\nAre you sure to do that ?"), GTK_RESPONSE_CANCEL))
- //~ return FALSE;
-
- //~ /* update all the accounts */
- //~ gsb_form_config_update_from_account (gsb_account_get_combo_account_number (combobox));
-
- //~ return FALSE;
-//~ }
-
-/**
* called when toggle a button of the form configuration, append or remove
* the value from the tree view
*
diff --git a/src/gsb_form_widget.c b/src/gsb_form_widget.c
index c1d2ade..11740dd 100644
--- a/src/gsb_form_widget.c
+++ b/src/gsb_form_widget.c
@@ -75,6 +75,8 @@ static gchar *old_debit = NULL;
static gchar *old_credit = NULL;
static gint old_credit_payment_number = 0;
static gint old_debit_payment_number = 0;
+static gchar *old_credit_payment_content = NULL;
+static gchar *old_debit_payment_content = NULL;
/**
* return the list wich contains the widgets of the form
@@ -747,6 +749,7 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
{
GtkWidget *fyear_button;
GtkWidget *widget;
+ GtkWidget *tmp_widget;
gint element_number;
gint account_number;
@@ -781,12 +784,12 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
if ( old_debit && strlen ( old_debit ) > 0 )
old_debit = NULL;
- /* we change the payment method to adapt it for the debit */
- /* empty the credit */
+ /* save the credit if necessary */
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CREDIT );
if ( !gsb_form_widget_check_empty ( widget ) )
old_credit = g_strdup ( gtk_entry_get_text ( GTK_ENTRY ( widget ) ) );
+ /* we change the payment method to adapt it for the debit */
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE);
/* change the method of payment if necessary
@@ -798,16 +801,20 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign ( widget ) == GSB_PAYMENT_CREDIT )
{
- old_credit_payment_number = gsb_payment_method_get_selected_number (
- widget );
+ old_credit_payment_number = gsb_payment_method_get_selected_number ( widget );
+
+ tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
+ if ( tmp_widget && GTK_WIDGET_VISIBLE ( tmp_widget ) )
+ {
+ if ( old_credit_payment_content )
+ g_free ( old_credit_payment_content );
+ old_credit_payment_content = g_strdup ( gtk_entry_get_text (
+ GTK_ENTRY ( tmp_widget ) ) );
+ }
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_DEBIT,
account_number, 0 );
- /* if there is no payment method, the last function hide it, but we have
- * to hide the cheque element too */
- if ( ! GTK_WIDGET_VISIBLE (widget) )
- gtk_widget_hide (gsb_form_widget_get_widget (TRANSACTION_FORM_CHEQUE));
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA );
if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
@@ -824,12 +831,12 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
if ( old_credit && strlen ( old_credit ) > 0 )
old_credit = NULL;
- /* we change the payment method to adapt it for the debit */
- /* empty the credit */
+ /* save the debit if necessary */
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_DEBIT );
if ( !gsb_form_widget_check_empty ( widget ) )
old_debit = g_strdup ( gtk_entry_get_text ( GTK_ENTRY ( widget ) ) );
+ /* we change the payment method to adapt it for the debit */
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_TYPE);
/* change the method of payment if necessary
@@ -841,16 +848,20 @@ gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
/* change the signe of the method of payment and the contra */
if ( gsb_payment_method_get_combo_sign (widget) == GSB_PAYMENT_DEBIT)
{
- old_debit_payment_number = gsb_payment_method_get_selected_number (
- widget );
+ old_debit_payment_number = gsb_payment_method_get_selected_number ( widget );
+
+ tmp_widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
+ if ( tmp_widget && GTK_WIDGET_VISIBLE ( tmp_widget ) )
+ {
+ if ( old_debit_payment_content )
+ g_free ( old_debit_payment_content );
+ old_debit_payment_content = g_strdup ( gtk_entry_get_text (
+ GTK_ENTRY ( tmp_widget ) ) );
+ }
gsb_payment_method_create_combo_list ( widget,
GSB_PAYMENT_CREDIT,
account_number, 0 );
- /* if there is no payment method, the last function hide it, but we have
- * to hide the cheque element too */
- if ( !GTK_WIDGET_VISIBLE (widget))
- gtk_widget_hide (gsb_form_widget_get_widget (TRANSACTION_FORM_CHEQUE));
widget = gsb_form_widget_get_widget ( TRANSACTION_FORM_CONTRA);
if ( widget && GTK_WIDGET_VISIBLE ( widget ) )
@@ -1054,7 +1065,7 @@ gboolean gsb_form_combo_selection_changed ( GtkTreeSelection *tree_selection,
*
*
* */
-gint gsb_form_widget_get_old_credit_payment ( void )
+gint gsb_form_widget_get_old_credit_payment_number ( void )
{
return old_credit_payment_number;
}
@@ -1066,12 +1077,36 @@ gint gsb_form_widget_get_old_credit_payment ( void )
*
*
* */
-gint gsb_form_widget_get_old_debit_payment ( void )
+gint gsb_form_widget_get_old_debit_payment_number ( void )
{
return old_debit_payment_number;
}
+/**
+ *
+ *
+ *
+ *
+ * */
+const gchar *gsb_form_widget_get_old_credit_payment_content ( void )
+{
+ return old_credit_payment_content;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+const gchar *gsb_form_widget_get_old_debit_payment_content ( void )
+{
+ return old_debit_payment_content;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/gsb_form_widget.h b/src/gsb_form_widget.h
index 4749575..09696df 100644
--- a/src/gsb_form_widget.h
+++ b/src/gsb_form_widget.h
@@ -26,9 +26,11 @@ gboolean gsb_form_widget_free_list ( void );
GSList *gsb_form_widget_get_list ( void );
gchar *gsb_form_widget_get_name ( gint element_number );
gchar *gsb_form_widget_get_old_credit ( void );
-gint gsb_form_widget_get_old_credit_payment ( void );
+gint gsb_form_widget_get_old_credit_payment_number ( void );
+const gchar *gsb_form_widget_get_old_credit_payment_content ( void );
gchar *gsb_form_widget_get_old_debit ( void );
-gint gsb_form_widget_get_old_debit_payment ( void );
+gint gsb_form_widget_get_old_debit_payment_number ( void );
+const gchar *gsb_form_widget_get_old_debit_payment_content ( void );
gboolean gsb_form_widget_get_valide_amout_entry ( const gchar *string );
GtkWidget *gsb_form_widget_get_widget ( gint element_number );
gint gsb_form_widget_next_element ( gint account_number,
diff --git a/src/gsb_payment_method.c b/src/gsb_payment_method.c
index c308f6d..4e88ffe 100644
--- a/src/gsb_payment_method.c
+++ b/src/gsb_payment_method.c
@@ -71,6 +71,7 @@ gboolean gsb_payment_method_create_combo_list ( GtkWidget *combo_box,
gint exclude )
{
GtkWidget *widget = NULL;
+ GtkWidget *cheque_entry;
GtkListStore *store;
GSList *tmp_list;
gint store_filled = 0;
@@ -137,10 +138,11 @@ gboolean gsb_payment_method_create_combo_list ( GtkWidget *combo_box,
"combo_sign",
GINT_TO_POINTER (sign));
+ cheque_entry = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
+
/* if nothing in the store, hide it */
if (store_filled)
{
- GtkWidget *cheque_entry;
gint payment_number = 0;
if ( sign == GSB_PAYMENT_DEBIT )
@@ -152,8 +154,6 @@ gboolean gsb_payment_method_create_combo_list ( GtkWidget *combo_box,
gtk_widget_show (combo_box);
- cheque_entry = gsb_form_widget_get_widget ( TRANSACTION_FORM_CHEQUE );
-
if ( gsb_data_payment_get_show_entry ( payment_number) )
{
/* set the next number if needed */
@@ -193,6 +193,12 @@ gboolean gsb_payment_method_create_combo_list ( GtkWidget *combo_box,
else
{
gtk_widget_hide (combo_box);
+ gtk_entry_set_text ( GTK_ENTRY (cheque_entry), "" );
+ gsb_form_entry_lose_focus ( cheque_entry,
+ FALSE,
+ GINT_TO_POINTER ( TRANSACTION_FORM_CHEQUE ));
+ gtk_widget_hide ( cheque_entry );
+
}
if ( widget )
g_signal_handlers_unblock_by_func (widget,
diff --git a/src/gsb_real.c b/src/gsb_real.c
index 891429c..0fee399 100644
--- a/src/gsb_real.c
+++ b/src/gsb_real.c
@@ -48,9 +48,23 @@ glong gsb_real_power_10[] = { 1, 10, 100, 1000, 10000, 100000,
#define sizeofarray(x) (sizeof(x)/sizeof(*x))
#ifdef _MSC_VER
+typedef struct _lldiv_t
+{
+ long long quot;
+ long long rem;
+} lldiv_t;
+
+lldiv_t lldiv(long long numerator, long long denominator)
+{
+ /* TODO find a standard/efficient impl for this */
+ lldiv_t result;
+ result.quot = numerator / denominator;
+ result.rem = numerator % denominator;
+ return result;
+}
#define lrint(x) (floor(x + 0.5))
#define rint(x) (floor(x + 0.5))
-#endif//_MSC_VER
+#endif /*_MSC_VER */
/*START_STATIC*/
static gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add );
@@ -398,18 +412,18 @@ gsb_real gsb_real_raw_get_from_string ( const gchar *string,
{
break;
}
- if ( sign == 0 ) sign = 1; // no sign found yet ==> positive
+ if ( sign == 0 ) sign = 1; /* no sign found yet ==> positive */
++nb_digits;
++p;
}
- else if ( *p == 0 ) // terminal zero
+ else if ( *p == 0 ) /* terminal zero */
{
success = TRUE;
break;
}
else if ( decimal_chars && strchr ( decimal_chars, *p ) )
{
- if ( dot_position >= 0 ) // already found a decimal separator
+ if ( dot_position >= 0 ) /* already found a decimal separator */
{
break;
}
@@ -418,12 +432,12 @@ gsb_real gsb_real_raw_get_from_string ( const gchar *string,
}
else if ( g_utf8_strchr ( space_chars, -1, g_utf8_get_char( p ) ) )
{
- // just skip spaces and thousands separators
+ /* just skip spaces and thousands separators */
p = g_utf8_find_next_char ( p, NULL );
}
else if ( strchr ( negative_chars, *p ) )
{
- if ( sign != 0 ) // sign already set
+ if ( sign != 0 ) /* sign already set */
{
break;
}
@@ -432,14 +446,14 @@ gsb_real gsb_real_raw_get_from_string ( const gchar *string,
}
else if ( strchr ( positive_chars, *p ) )
{
- if ( sign != 0 ) // sign already set
+ if ( sign != 0 ) /* sign already set */
{
break;
}
sign = 1;
++p;
}
- else // unknown char ==> error
+ else /* unknown char ==> error */
{
break;
}
@@ -497,12 +511,12 @@ gsb_real gsb_real_import_from_string ( const gchar *string )
mantissa += ( *p - '0' );
if ( mantissa > G_MAXLONG )
return error_real;
- if ( sign == 0 ) sign = 1; // no sign found yet ==> positive
+ if ( sign == 0 ) sign = 1; /* no sign found yet ==> positive */
++nb_digits;
++p;
- //~ printf ("mantissa = %lld nb_digits = %d\n", mantissa, nb_digits);
+ /* printf ("mantissa = %lld nb_digits = %d\n", mantissa, nb_digits); */
}
- else if ( *p == 0 ) // terminal zero
+ else if ( *p == 0 ) /* terminal zero */
{
gsb_real result;
result.mantissa = sign * mantissa;
@@ -512,24 +526,24 @@ gsb_real gsb_real_import_from_string ( const gchar *string )
result.exponent = ( dot_position >= 0 )
? nb_digits - dot_position
: 0;
- //~ printf ("result.mantissa = %ld result.exponent = %d\n", result.mantissa, result.exponent);
+ /* printf ("result.mantissa = %ld result.exponent = %d\n", result.mantissa, result.exponent); */
return result;
}
else if ( strchr ( ".", *p ) )
{
- if ( dot_position >= 0 ) // already found a decimal separator
+ if ( dot_position >= 0 ) /* already found a decimal separator */
return error_real;
dot_position = nb_digits;
p = g_utf8_find_next_char ( p, NULL );
}
else if ( strchr ( "-", *p ) )
{
- if ( sign != 0 ) // sign already set
+ if ( sign != 0 ) /* sign already set */
return error_real;
sign = -1;
++p;
}
- else // unknown char ==> error
+ else /* unknown char ==> error */
{
return error_real;
}
@@ -879,7 +893,7 @@ gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add )
gsb_real real_number = {0, exp_add};
maxlong = G_MAXLONG / 10;
- //~ printf ("number initial = %f exp_add = %d\n",number, exp_add);
+ /* printf ("number initial = %f exp_add = %d\n",number, exp_add); */
if(exp_add >=9)
return null_real;
@@ -894,7 +908,7 @@ gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add )
number = rint (number);
}
decimal = modf ( number, &tmp_double );
- //~ printf ("number = %f decimal = %f tmp_double = %f\n", number, decimal, tmp_double);
+ /* printf ("number = %f decimal = %f tmp_double = %f\n", number, decimal, tmp_double); */
if ( ( ( real_number.exponent == ( 9 - exp_add ) ) ) && ( fabs ( decimal ) >= 0.5 ) )
{
if ( tmp_double < 0 )
@@ -906,7 +920,7 @@ gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add )
}
else
real_number.mantissa = (glong) ( tmp_double );
- //~ printf ("real_number.mantissa = %ld real_number.exponent = %d\n", real_number.mantissa,real_number.exponent);
+ /* printf ("real_number.mantissa = %ld real_number.exponent = %d\n", real_number.mantissa,real_number.exponent); */
return real_number;
}
@@ -943,7 +957,7 @@ gboolean gsb_real_raw_truncate_number ( gint64 *mantissa, gint *exponent )
return FALSE;
}
- // exponent must be greater or equal to 0
+ /* exponent must be greater or equal to 0 */
if (new_exponent < 0)
{
return FALSE;
@@ -1120,8 +1134,8 @@ gchar *gsb_real_save_real_to_string ( gsb_real number, gint default_exponent )
}
}
}
- //~ printf ("number.mantissa = %ld number.exponent = %d résultat = %s\n",
- //~ number.mantissa, number.exponent, result );
+ /* printf ("number.mantissa = %ld number.exponent = %d résultat = %s\n",
+ number.mantissa, number.exponent, result ); */
return result;
}
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index c5967af..70d510e 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -702,7 +702,7 @@ gboolean gsb_scheduler_list_append_new_scheduled ( gint scheduled_number,
const gchar *line[SCHEDULER_COL_VISIBLE_COLUMNS];
gint mother_scheduled_number;
- //~ devel_debug_int (scheduled_number);
+ /* devel_debug_int (scheduled_number); */
if (!tree_model_scheduler_list)
return FALSE;
@@ -995,7 +995,7 @@ gboolean gsb_scheduler_list_fill_transaction_text ( gint scheduled_number,
&&
frequency >= 0 )
{
- gchar * names[] = { _("Once"), _("Weekly"), _("Montly"),
+ gchar * names[] = { _("Once"), _("Weekly"), _("Monthly"),
_("Bimonthly"), _("Quarterly"), _("Yearly") };
line[COL_NB_FREQUENCY] = names [frequency];
}
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index 207038f..d2090a3 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -449,8 +449,6 @@ void gsb_select_icon_entry_text_changed ( GtkComboBoxEntry *entry,
path, TRUE, 0.5, 0 );
gtk_widget_set_sensitive (bouton_OK, FALSE );
}
- //~ else
- //~ devel_debug ( "ce n'est pas un répertoire" );
}
}
@@ -520,13 +518,13 @@ gchar * gsb_select_icon_troncate_name_icon ( gchar *name_icon, gint trunc )
n--;
tmpstr = g_malloc ( size + n + 1 );
- //~ devel_debug_int ( n );
- //~ devel_debug ( name_icon );
+ /* devel_debug_int ( n );
+ devel_debug ( name_icon ); */
tmpstr = g_utf8_strncpy ( tmpstr, name_icon, trunc );
do
{
end = g_utf8_offset_to_pointer ( name_icon, i * trunc );
- //~ devel_debug ( end );
+ /* devel_debug ( end ); */
if ( i < n )
ptr = g_utf8_offset_to_pointer ( name_icon, ( i + 1 ) * 10 );
if ( ptr )
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index 7331ca7..4940cba 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -951,7 +951,7 @@ gboolean gsb_transactions_list_set_row_align ( gfloat row_align )
gint mother_transaction;
gint account_number;
- //~ devel_debug (NULL);
+ /* devel_debug (NULL); */
if ( ( account_number = gsb_gui_navigation_get_current_account ( ) ) == -1)
return FALSE;
@@ -2084,7 +2084,7 @@ gboolean gsb_transactions_list_delete_transaction_from_tree_view ( gint transact
{
gint contra_transaction_number;
- //~ devel_debug_int (transaction_number);
+ /* devel_debug_int (transaction_number); */
if ( transaction_number == -1 )
return FALSE;
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index ad67ca6..5e8610d 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -180,11 +180,8 @@ enum combofix_key_direction {
* */
GtkWidget *gtk_combofix_new ( GSList *list )
{
- //~ GtkComboFixPrivate *priv;
GtkComboFix *combofix = g_object_new ( GTK_TYPE_COMBOFIX, NULL );
- //~ priv = combofix -> priv;
-
gtk_combofix_set_list (combofix, list);
return ( GTK_WIDGET ( combofix ) );
@@ -451,7 +448,7 @@ void gtk_combofix_append_text ( GtkComboFix *combofix, const gchar *text )
g_return_if_fail ( combofix );
g_return_if_fail ( GTK_IS_COMBOFIX ( combofix ) );
- //~ g_print ("gtk_combofix_append_text = %s\n", text );
+ /* g_print ("gtk_combofix_append_text = %s\n", text ); */
priv = combofix -> priv;
pointers[2] = GINT_TO_POINTER ( priv -> case_sensitive );
diff --git a/src/import.c b/src/import.c
index 62fd799..f682e46 100644
--- a/src/import.c
+++ b/src/import.c
@@ -2492,7 +2492,7 @@ gint gsb_import_create_transaction ( struct struct_ope_importation *imported_tra
&&
strlen (imported_transaction -> categ))
{
- // Fill budget if existing
+ /* Fill budget if existing */
if ( imported_transaction -> budget
&&
strlen (imported_transaction -> budget))
@@ -2569,7 +2569,7 @@ gint gsb_import_create_transaction ( struct struct_ope_importation *imported_tra
gsb_data_transaction_set_category_number ( transaction_number, 0 );
gsb_data_transaction_set_sub_category_number ( transaction_number, 0 );
- // Fill budget if existing
+ /* Fill budget if existing */
if ( imported_transaction -> budget
&&
strlen (imported_transaction -> budget))
@@ -2600,14 +2600,14 @@ gint gsb_import_create_transaction ( struct struct_ope_importation *imported_tra
transaction_number, imported_transaction -> cheque );
break;
- //~ case OFX_INT:
- //~ break;
- //~ case OFX_DIV:
- //~ break;
- //~ case OFX_SRVCHG:
- //~ break;
- //~ case OFX_FEE:
- //~ break;
+ /* case OFX_INT:
+ break;
+ case OFX_DIV:
+ break;
+ case OFX_SRVCHG:
+ break;
+ case OFX_FEE:
+ break; */
case OFX_DEP:
/* Deposit = Dépôt */
payment_number = gsb_data_payment_get_number_by_name ( _("Deposit"),
@@ -2657,8 +2657,8 @@ gint gsb_import_create_transaction ( struct struct_ope_importation *imported_tra
gsb_data_transaction_set_method_of_payment_number (transaction_number, payment_number);
break;
- //~ case OFX_REPEATPMT:
- //~ break;
+ /* case OFX_REPEATPMT:
+ break; */
case OFX_DEBIT:
case OFX_CREDIT:
diff --git a/src/import_csv.c b/src/import_csv.c
index 6f0ff26..007755b 100644
--- a/src/import_csv.c
+++ b/src/import_csv.c
@@ -505,7 +505,7 @@ gint csv_skip_lines ( gchar ** contents, gint num_lines, gchar * separator )
GSList * list;
int i;
- //~ g_print ("Skipping %d lines\n", num_lines );
+ /* g_print ("Skipping %d lines\n", num_lines ); */
for ( i = 0; i < num_lines; i ++ )
{
@@ -1173,7 +1173,7 @@ gboolean csv_import_csv_account ( GtkWidget * assistant, struct imported_file *
* earlier. */
if ( index < CSV_MAX_TOP_LINES && etat.csv_skipped_lines [ index ] )
{
- //~ g_print ("Skipping line %d\n", index );
+ /* g_print ("Skipping line %d\n", index ); */
list = csv_get_next_line ( &contents, separator );
index++;
continue;
@@ -1217,19 +1217,19 @@ gboolean csv_import_csv_account ( GtkWidget * assistant, struct imported_file *
}
else if ( ! field -> parse ( ope, list -> data ) )
{
- //~ g_print ("%s", "(failed)");
+ /* g_print ("%s", "(failed)"); */
}
}
else
{
- //~ g_print ("%s", "(invalid)");
+ /* g_print ("%s", "(invalid)"); */
}
}
}
list = list -> next;
}
- //~ g_print (">> Appending new transaction %p\n", ope );
+ /* g_print (">> Appending new transaction %p\n", ope ); */
compte -> operations_importees = g_slist_append ( compte -> operations_importees,
ope );
diff --git a/src/include.h b/src/include.h
index b478b18..19f2922 100644
--- a/src/include.h
+++ b/src/include.h
@@ -20,7 +20,7 @@
#ifndef _MSC_VER
# include <unistd.h>
# include <pwd.h>
-#endif//_MSC_VER
+#endif /*_MSC_VER */
#include <fcntl.h>
#include <signal.h>
#include <ctype.h>
diff --git a/src/main.c b/src/main.c
index 45c79f1..e735af5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,7 +53,7 @@
#include "erreur.h"
/*END_INCLUDE*/
-// including resources so that the exe generated with MSVC has the right icon.
+/* including resources so that the exe generated with MSVC has the right icon. */
#ifdef _MSC_VER
#include "resource.h"
#endif
diff --git a/src/metatree.c b/src/metatree.c
index be173ed..49a47cf 100644
--- a/src/metatree.c
+++ b/src/metatree.c
@@ -2339,7 +2339,7 @@ gboolean metatree_selection_changed ( GtkTreeSelection * selection, GtkTreeModel
return FALSE;
/* Update sensitiveness of linked widgets. */
- //~ metatree_set_linked_widgets_sensitive ( model, selection_is_set, "selection" );
+ /* metatree_set_linked_widgets_sensitive ( model, selection_is_set, "selection" ); */
if ( ! div_id || ( sub_div_id <= 0 && current_number <= 0 ) )
{
metatree_set_linked_widgets_sensitive ( model, FALSE, "selection" );
diff --git a/src/navigation.c b/src/navigation.c
index e79fc22..2773b1d 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -1185,7 +1185,7 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
NULL,
gtk_notebook_get_current_page ( GTK_NOTEBOOK ( account_page ) ),
NULL );
- //~ gsb_form_show ( FALSE );
+ /* gsb_form_show ( FALSE ); */
buffer_last_account = account_number;
diff --git a/src/parse_cmdline.c b/src/parse_cmdline.c
index d0b0ba9..b8285aa 100644
--- a/src/parse_cmdline.c
+++ b/src/parse_cmdline.c
@@ -109,12 +109,12 @@ gboolean parse_options(int argc, char **argv, cmdline_options *pOpt, gint* pErr
/* -h : short help = usage */
case 'v' : /* -v */
case 'V' : /* --version */
- app_must_stop = TRUE;// stopping here!
+ app_must_stop = TRUE; /* stopping here! */
show_version();
break;
case 'h': /* -h */
case 'H': /* --help */
- app_must_stop = TRUE;// stopping here!
+ app_must_stop = TRUE; /* stopping here! */
show_help();
break;
case 't': /* -t <str> */
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index f5593f5..c55024d 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -13,8 +13,8 @@ G_MODULE_EXPORT extern GSList * ofx_plugin_run ( GtkWidget * assistant,
/* END_DECLARATION */
-//It seems the following applies to everyone, otherwise OFX_* are not defined
-//#ifdef _WIN32
+/* It seems the following applies to everyone, otherwise OFX_* are not defined */
+/* #ifdef _WIN32 */
/* On Windows, the Ofx Severity enumerate values are already used in wingdi.h, DELETE is used in winnt.h
* This is a work around to this issues :
* INFO, WARN, ERROR, DELETE and REPLACE are used in standard libofx.h;
@@ -41,6 +41,6 @@ G_MODULE_EXPORT extern GSList * ofx_plugin_run ( GtkWidget * assistant,
#define OFX_REPLACE REPLACE
#endif
-// #endif /* _WIN32 */
+/* #endif _WIN32 */
#endif /* GSB_OFX_H */
diff --git a/src/tip.c b/src/tip.c
index f8e46a7..6e5295c 100644
--- a/src/tip.c
+++ b/src/tip.c
@@ -142,7 +142,7 @@ void display_tip ( gboolean force )
btn_forward = gtk_dialog_add_button (GTK_DIALOG(dialog), GTK_STOCK_GO_FORWARD, 2);
btn_close = gtk_dialog_add_button (GTK_DIALOG(dialog), GTK_STOCK_CLOSE, 3);
- //~ gtk_widget_set_size_request ( dialog, 450, -1 );
+ /* gtk_widget_set_size_request ( dialog, 450, -1 ); */
/* We iterate as user can select several tips. */
while ( TRUE )
{
diff --git a/src/transaction_list.c b/src/transaction_list.c
index 3c86687..d466874 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -722,10 +722,10 @@ void transaction_list_filter ( gint account_number )
}
else
record -> has_expander = FALSE;
- //~ printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction =%d\n",
- //~ gsb_data_transaction_get_transaction_number ( record -> transaction_pointer),
- //~ record -> filtered_pos,
- //~ record -> line_in_transaction);
+ /* printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction =%d\n",
+ gsb_data_transaction_get_transaction_number ( record -> transaction_pointer),
+ record -> filtered_pos,
+ record -> line_in_transaction); */
/* the value of the row is set in memory, we update the tree view if necessary */
/* if the record was already shown and the position hasn't change, nothing to do */
@@ -992,10 +992,10 @@ gboolean transaction_list_update_transaction ( gint transaction_number )
record = iter.user_data;
if (!record)
return FALSE;
- //~ printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction = %d\n",
- //~ transaction_number,
- //~ record -> filtered_pos,
- //~ record -> line_in_transaction);
+ /* printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction = %d\n",
+ transaction_number,
+ record -> filtered_pos,
+ record -> line_in_transaction); */
/* if the transaction is a split, we need to check if there are already children,
* else we add the white line */
diff --git a/src/transaction_list_sort.c b/src/transaction_list_sort.c
index fda546b..aee8098 100644
--- a/src/transaction_list_sort.c
+++ b/src/transaction_list_sort.c
@@ -97,21 +97,21 @@ void transaction_list_sort (void)
for (i = 0; i < custom_list->num_visibles_rows; ++i)
{
- //~ CustomRecord *record;
- //~ gint transaction_number;
-
- //~ record = custom_list -> visibles_rows[i];
- //~ transaction_number = gsb_data_transaction_get_transaction_number (
- //~ record -> transaction_pointer);
- //~ printf ("pos = %d date = %s transaction_number = %d\n",
- //~ i,
- //~ gsb_format_gdate ( gsb_data_transaction_get_date (
- //~ transaction_number ) ),
- //~ transaction_number);
- //~ printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction =%d\n",
- //~ gsb_data_transaction_get_transaction_number ( record -> transaction_pointer),
- //~ record -> filtered_pos,
- //~ record -> line_in_transaction);
+ /* CustomRecord *record;
+ gint transaction_number;
+
+ record = custom_list -> visibles_rows[i];
+ transaction_number = gsb_data_transaction_get_transaction_number (
+ record -> transaction_pointer);
+ printf ("pos = %d date = %s transaction_number = %d\n",
+ i,
+ gsb_format_gdate ( gsb_data_transaction_get_date (
+ transaction_number ) ),
+ transaction_number);
+ printf ("transaction_number = %d record -> filtered_pos = %d record -> line_in_transaction =%d\n",
+ gsb_data_transaction_get_transaction_number ( record -> transaction_pointer),
+ record -> filtered_pos,
+ record -> line_in_transaction); */
neworder[i] = (custom_list->visibles_rows[i])->filtered_pos;
(custom_list->visibles_rows[i])->filtered_pos = i;
}
diff --git a/src/utils.c b/src/utils.c
index f997b1a..21a9ee4 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -167,7 +167,7 @@ gboolean lance_navigateur_web ( const gchar *url )
use_default_browser = !strcmp ( conf.browser_command,ETAT_W
WW_BROWSER );
}
-#else // !_WIN32
+#else /* _WIN32 */
if ( !( conf.browser_command && strlen ( conf.browser_command ) ) )
{
tmp_str = g_strdup_printf ( _("Grisbi was unable to execute a web browser to "
@@ -178,13 +178,13 @@ gboolean lance_navigateur_web ( const gchar *url )
return FALSE;
}
-#endif // _WIN32
+#endif /* _WIN32 */
#ifdef _WIN32
if (!use_default_browser)
{
-#endif // _WIN32
+#endif /* _WIN32 */
/* search if the sequence `%s' is in the string
* and split the string before and after this delimiter */
split = g_strsplit ( conf.browser_command, "%s", 0 );
@@ -222,7 +222,7 @@ gboolean lance_navigateur_web ( const gchar *url )
{
win32_shell_execute_open ( url );
}
-#endif // _WIN32
+#endif /* _WIN32 */
g_free(chaine);
return FALSE;
diff --git a/src/utils_dates.c b/src/utils_dates.c
index 3128be8..dda3030 100644
--- a/src/utils_dates.c
+++ b/src/utils_dates.c
@@ -26,7 +26,7 @@
#include <winnls.h>
#else
#include <langinfo.h>
-#endif//_MSC_VER
+#endif /*_MSC_VER */
/*START_INCLUDE*/
#include "utils_dates.h"
diff --git a/src/utils_file_selection.c b/src/utils_file_selection.c
index 796a703..5cb414f 100644
--- a/src/utils_file_selection.c
+++ b/src/utils_file_selection.c
@@ -272,22 +272,22 @@ gchar* file_selection_get_last_directory(GtkFileChooser* filesel,gboolean ended)
gboolean is_endedstr = FALSE;
gchar* tmpstr;
- // Chek if the sirectory string is ended by a separator
- // (if directory string is small than the separator string
- // it can ot be ended by the separator string)
+ /* Chek if the sirectory string is ended by a separator
+ (if directory string is small than the separator string
+ it can ot be ended by the separator string) */
if ( dirstr_len >= sepstr_len)
{
is_endedstr = (gboolean)(!strncmp( dirstr + dirstr_len - sepstr_len, sepstr, sepstr_len));
}
- // We want the dirstr ended by a sepstrarator but there no
+ /* We want the dirstr ended by a sepstrarator but there no */
if (ended&&!is_endedstr)
{
tmpstr = g_strconcat(dirstr,G_DIR_SEPARATOR_S,NULL);
g_free(dirstr);
dirstr = tmpstr;
}
- // We do not want to have a separator at the end, but there is one
+ /* We do not want to have a separator at the end, but there is one */
else if ((!ended)&&is_endedstr)
{
dirstr[dirstr_len-sepstr_len-1] = 0;
diff --git a/src/utils_files.c b/src/utils_files.c
index 457574e..48310f3 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -507,7 +507,7 @@ gboolean utils_files_create_XDG_dir (void)
int mode = 0;
#else
int mode = S_IRUSR | S_IWUSR | S_IXUSR;
-#endif//_MSC_VER
+#endif /*_MSC_VER */
if ( g_mkdir_with_parents ( C_PATH_CONFIG, mode ) == 0 &&
g_mkdir_with_parents ( C_PATH_DATA_FILES, mode ) == 0 )
return TRUE;
@@ -879,8 +879,8 @@ gchar *utils_files_get_ofx_charset ( gchar *contents )
}
i++;
} while ( all_charset_array[i] );
- //CHARSET found in OFX file, but no match --> Exit function
- return NULL;
+ /* CHARSET found in OFX file, but no match --> Exit function */
+ return NULL;
}
g_free ( string );
ptr = ptr_tmp + 1;
diff --git a/src/utils_str.c b/src/utils_str.c
index 1277615..b9ae115 100644
--- a/src/utils_str.c
+++ b/src/utils_str.c
@@ -64,7 +64,7 @@ gchar *utils_str_itoa ( gint integer )
num = abs(integer);
- // Construct the result in the reverse order from right to left, then reverse it.
+ /* Construct the result in the reverse order from right to left, then reverse it. */
do
{
result_div = div ( num, 10 );
@@ -73,8 +73,8 @@ gchar *utils_str_itoa ( gint integer )
}
while ( ( num = result_div.quot ));
- // Add the sign at the end of the string just before to reverse it to avoid
- // to have to insert it at the begin just after...
+ /* Add the sign at the end of the string just before to reverse it to avoid
+ to have to insert it at the begin just after... */
if (integer < 0)
{
chaine[i++] = '-';
hooks/post-receive
--
grisbi
More information about the cvs
mailing list