[grisbi-cvs] [SCM] grisbi branch, master, updated. 399d5adc2036d6a43e43a9d19947f2225a3636b3
Rémi Cardona
nobody at users.sourceforge.net
Thu Jun 24 08:40:43 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 399d5adc2036d6a43e43a9d19947f2225a3636b3 (commit)
via 7a665f53262bf00c422baa6af7b0c78b45bdb896 (commit)
via 4d8c4aadfd364757b54501129459954980788020 (commit)
from a1035c4d3c077e15a5bf107940c101fbd5292374 (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 399d5adc2036d6a43e43a9d19947f2225a3636b3
Author: Rémi Cardona <remi at gentoo.org>
Date: Wed Jun 23 07:57:25 2010 +0200
replace deprecated GLib function g_date_day() with g_date_get_day()
commit 7a665f53262bf00c422baa6af7b0c78b45bdb896
Author: Rémi Cardona <remi at gentoo.org>
Date: Wed Jun 23 07:55:43 2010 +0200
replace deprecated GLib function g_date_month() with g_date_get_month()
commit 4d8c4aadfd364757b54501129459954980788020
Author: Rémi Cardona <remi at gentoo.org>
Date: Wed Jun 23 07:53:19 2010 +0200
replace deprecated GLib function g_date_year() with g_date_get_year()
-----------------------------------------------------------------------
Changes:
diff --git a/src/etats_affiche.c b/src/etats_affiche.c
index fd49cef..cdd69a7 100644
--- a/src/etats_affiche.c
+++ b/src/etats_affiche.c
@@ -856,16 +856,16 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
{
case 0:
/* split by day, set the day of the transaction */
- date_debut_periode = g_date_new_dmy ( g_date_day ( date),
- g_date_month ( date),
- g_date_year ( date));
+ date_debut_periode = g_date_new_dmy ( g_date_get_day ( date),
+ g_date_get_month ( date),
+ g_date_get_year ( date));
break;
case 1:
/* séparation par semaine : on recherche le début de la semaine qui contient l'opé */
- date_debut_periode = g_date_new_dmy ( g_date_day ( date),
- g_date_month ( date),
- g_date_year ( date));
+ date_debut_periode = g_date_new_dmy ( g_date_get_day ( date),
+ g_date_get_month ( date),
+ g_date_get_year ( date));
if ( g_date_get_weekday ( date_debut_periode ) != jour_debut_semaine )
{
@@ -881,8 +881,8 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
/* séparation par mois */
date_debut_periode = g_date_new_dmy ( 1,
- g_date_month ( date),
- g_date_year ( date));
+ g_date_get_month ( date),
+ g_date_get_year ( date));
break;
case 3:
@@ -890,7 +890,7 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
date_debut_periode = g_date_new_dmy ( 1,
1,
- g_date_year ( date));
+ g_date_get_year ( date));
break;
}
}
@@ -948,9 +948,9 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
/* si on est en début de semaine, on met un sous total */
- date_tmp = g_date_new_dmy ( g_date_day ( date_debut_periode ),
- g_date_month ( date_debut_periode ),
- g_date_year ( date_debut_periode ));
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_debut_periode ),
+ g_date_get_month ( date_debut_periode ),
+ g_date_get_year ( date_debut_periode ));
g_date_add_days ( date_tmp,
7 );
@@ -976,9 +976,9 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
g_date_free ( date_tmp );
- date_tmp = g_date_new_dmy ( g_date_day ( date_debut_periode ),
- g_date_month ( date_debut_periode ),
- g_date_year ( date_debut_periode ));
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_debut_periode ),
+ g_date_get_month ( date_debut_periode ),
+ g_date_get_year ( date_debut_periode ));
g_date_add_days ( date_tmp,
6 );
if ( gsb_data_report_get_show_report_transaction_amount (current_report_number))
@@ -1010,7 +1010,7 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
if ( !force
&&
- g_date_month ( date) == g_date_month ( date_debut_periode ) )
+ g_date_get_month ( date) == g_date_get_month ( date_debut_periode ) )
return ( ligne );
g_date_strftime ( buffer,
@@ -1038,7 +1038,7 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
if ( !force
&&
- g_date_year ( date) == g_date_year ( date_debut_periode ) )
+ g_date_get_year ( date) == g_date_get_year ( date_debut_periode ) )
return ( ligne );
g_date_strftime ( buffer,
@@ -1094,16 +1094,16 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
{
case 0:
/* split by day, set on the transactions day */
- date_debut_periode = g_date_new_dmy ( g_date_day ( date),
- g_date_month ( date),
- g_date_year ( date));
+ date_debut_periode = g_date_new_dmy ( g_date_get_day ( date),
+ g_date_get_month ( date),
+ g_date_get_year ( date));
break;
case 1:
/* séparation par semaine : on recherche le début de la semaine qui contient l'opé */
- date_debut_periode = g_date_new_dmy ( g_date_day ( date),
- g_date_month ( date),
- g_date_year ( date));
+ date_debut_periode = g_date_new_dmy ( g_date_get_day ( date),
+ g_date_get_month ( date),
+ g_date_get_year ( date));
if ( g_date_get_weekday ( date_debut_periode ) != jour_debut_semaine )
{
@@ -1119,8 +1119,8 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
/* séparation par mois */
date_debut_periode = g_date_new_dmy ( 1,
- g_date_month ( date),
- g_date_year ( date));
+ g_date_get_month ( date),
+ g_date_get_year ( date));
break;
case 3:
@@ -1128,7 +1128,7 @@ gint etat_affiche_affiche_total_periode ( gint transaction_number,
date_debut_periode = g_date_new_dmy ( 1,
1,
- g_date_year ( date));
+ g_date_get_year ( date));
break;
}
}
diff --git a/src/etats_calculs.c b/src/etats_calculs.c
index b32760c..8ff30c6 100644
--- a/src/etats_calculs.c
+++ b/src/etats_calculs.c
@@ -759,25 +759,25 @@ GSList *recupere_opes_etat ( gint report_number )
case 3:
/* mois en cours */
- if ( g_date_month ( date_jour ) != g_date_month ( gsb_data_transaction_get_date (transaction_number_tmp))
+ if ( g_date_get_month ( date_jour ) != g_date_get_month ( gsb_data_transaction_get_date (transaction_number_tmp))
||
- g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
+ g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
goto operation_refusee;
break;
case 4:
/* année en cours */
- if ( g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
+ if ( g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
goto operation_refusee;
break;
case 5:
/* cumul mensuel */
- if ( g_date_month ( date_jour ) != g_date_month ( gsb_data_transaction_get_date (transaction_number_tmp))
+ if ( g_date_get_month ( date_jour ) != g_date_get_month ( gsb_data_transaction_get_date (transaction_number_tmp))
||
- g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp))
+ g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp))
||
g_date_compare ( date_jour,
gsb_data_transaction_get_date (transaction_number_tmp)) < 0 )
@@ -787,7 +787,7 @@ GSList *recupere_opes_etat ( gint report_number )
case 6:
/* cumul annuel */
- if ( g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp))
+ if ( g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp))
||
g_date_compare ( date_jour,
gsb_data_transaction_get_date (transaction_number_tmp)) < 0 )
@@ -800,9 +800,9 @@ GSList *recupere_opes_etat ( gint report_number )
g_date_subtract_months ( date_jour,
1 );
- if ( g_date_month ( date_jour ) != g_date_month ( gsb_data_transaction_get_date (transaction_number_tmp))
+ if ( g_date_get_month ( date_jour ) != g_date_get_month ( gsb_data_transaction_get_date (transaction_number_tmp))
||
- g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
+ g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
goto operation_refusee;
break;
@@ -812,16 +812,16 @@ GSList *recupere_opes_etat ( gint report_number )
g_date_subtract_years ( date_jour,
1 );
- if ( g_date_year ( date_jour ) != g_date_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
+ if ( g_date_get_year ( date_jour ) != g_date_get_year ( gsb_data_transaction_get_date (transaction_number_tmp)))
goto operation_refusee;
break;
case 9:
/* 30 derniers jours */
- date_tmp = g_date_new_dmy ( g_date_day ( date_jour ),
- g_date_month ( date_jour ),
- g_date_year ( date_jour ) );
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_jour ),
+ g_date_get_month ( date_jour ),
+ g_date_get_year ( date_jour ) );
g_date_subtract_days ( date_tmp,
30 );
if ( g_date_compare ( date_tmp,
@@ -835,9 +835,9 @@ GSList *recupere_opes_etat ( gint report_number )
case 10:
/* 3 derniers mois */
- date_tmp = g_date_new_dmy ( g_date_day ( date_jour ),
- g_date_month ( date_jour ),
- g_date_year ( date_jour ) );
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_jour ),
+ g_date_get_month ( date_jour ),
+ g_date_get_year ( date_jour ) );
g_date_subtract_months ( date_tmp,
3 );
if ( g_date_compare ( date_tmp,
@@ -851,9 +851,9 @@ GSList *recupere_opes_etat ( gint report_number )
case 11:
/* 6 derniers mois */
- date_tmp = g_date_new_dmy ( g_date_day ( date_jour ),
- g_date_month ( date_jour ),
- g_date_year ( date_jour ) );
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_jour ),
+ g_date_get_month ( date_jour ),
+ g_date_get_year ( date_jour ) );
g_date_subtract_months ( date_tmp,
6 );
if ( g_date_compare ( date_tmp,
@@ -867,9 +867,9 @@ GSList *recupere_opes_etat ( gint report_number )
case 12:
/* 12 derniers mois */
- date_tmp = g_date_new_dmy ( g_date_day ( date_jour ),
- g_date_month ( date_jour ),
- g_date_year ( date_jour ) );
+ date_tmp = g_date_new_dmy ( g_date_get_day ( date_jour ),
+ g_date_get_month ( date_jour ),
+ g_date_get_year ( date_jour ) );
g_date_subtract_months ( date_tmp,
12 );
if ( g_date_compare ( date_tmp,
diff --git a/src/etats_support.c b/src/etats_support.c
index b3d5ab2..8510822 100644
--- a/src/etats_support.c
+++ b/src/etats_support.c
@@ -217,7 +217,7 @@ gchar *etats_titre ( gint report_number)
", ",
g_strdup_printf ( _("%s %d"),
buffer_date,
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
@@ -226,7 +226,7 @@ gchar *etats_titre ( gint report_number)
titre = g_strconcat ( titre,
", ", g_strdup_printf ( _("year %d"),
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
@@ -264,7 +264,7 @@ gchar *etats_titre ( gint report_number)
", ",
g_strdup_printf ( _("%s %d"),
buffer_date,
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
@@ -273,7 +273,7 @@ gchar *etats_titre ( gint report_number)
titre = g_strconcat ( titre,
", ", g_strdup_printf ( _("year %d"),
- g_date_year (today_date) - 1),
+ g_date_get_year (today_date) - 1),
NULL );
break;
@@ -312,11 +312,11 @@ gchar *etats_titre ( gint report_number)
", ",
g_strdup_printf ( _("from %s %d"),
buffer_date_2,
- g_date_year ( date_tmp )),
+ g_date_get_year ( date_tmp )),
" ",
g_strdup_printf ( _("to %s %d"),
buffer_date,
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
@@ -340,11 +340,11 @@ gchar *etats_titre ( gint report_number)
", ",
g_strdup_printf ( _("from %s %d"),
buffer_date_2,
- g_date_year ( date_tmp )),
+ g_date_get_year ( date_tmp )),
" ",
g_strdup_printf ( _("to %s %d"),
buffer_date,
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
@@ -367,11 +367,11 @@ gchar *etats_titre ( gint report_number)
", ",
g_strdup_printf ( _("from %s %d"),
buffer_date_2,
- g_date_year ( date_tmp )),
+ g_date_get_year ( date_tmp )),
" ",
g_strdup_printf ( _("to %s %d"),
buffer_date,
- g_date_year (today_date)),
+ g_date_get_year (today_date)),
NULL );
break;
}
diff --git a/src/export_csv.c b/src/export_csv.c
index f4396e7..cd72c9b 100644
--- a/src/export_csv.c
+++ b/src/export_csv.c
@@ -442,9 +442,9 @@ static gboolean gsb_csv_export_transaction ( gint transaction_number,
{
CSV_CLEAR_FIELD (csv_field_date);
csv_field_date = g_strdup_printf ("%d/%d/%d",
- g_date_day ( date ),
- g_date_month ( date ),
- g_date_year ( date ) );
+ g_date_get_day ( date ),
+ g_date_get_month ( date ),
+ g_date_get_year ( date ) );
}
value_date = gsb_data_transaction_get_value_date ( transaction_number );
@@ -452,9 +452,9 @@ static gboolean gsb_csv_export_transaction ( gint transaction_number,
{
CSV_CLEAR_FIELD (csv_field_date_val);
csv_field_date_val = g_strdup_printf ("%d/%d/%d",
- g_date_day ( value_date ),
- g_date_month ( value_date ),
- g_date_year ( value_date ) );
+ g_date_get_day ( value_date ),
+ g_date_get_month ( value_date ),
+ g_date_get_year ( value_date ) );
}
/* met le pointage */
diff --git a/src/gsb_calendar_entry.c b/src/gsb_calendar_entry.c
index 6f93684..5b84386 100644
--- a/src/gsb_calendar_entry.c
+++ b/src/gsb_calendar_entry.c
@@ -675,9 +675,9 @@ gboolean gsb_calendar_entry_calendar_key_press ( GtkCalendar *pCalendar,
return TRUE;
}
- day = g_date_day (date);
- month = g_date_month (date);
- year = g_date_year (date);
+ day = g_date_get_day (date);
+ month = g_date_get_month (date);
+ year = g_date_get_year (date);
g_date_free (date);
/* to avoid a warning */
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 7e9c4f8..cd9552b 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -8613,7 +8613,7 @@ gboolean gsb_file_load_update_previous_version ( void )
reconcile_number = gsb_data_reconcile_get_account_last_number (
reconcile -> account_number );
final_date = gsb_data_reconcile_get_final_date ( reconcile_number );
- ecart_date = g_date_days_between ( final_date, reconcile -> final_date );
+ ecart_date = g_date_get_days_between ( final_date, reconcile -> final_date );
if ( abs (ecart_date) < 10 )
{
diff --git a/src/gsb_scheduler.c b/src/gsb_scheduler.c
index d951572..f78ac87 100644
--- a/src/gsb_scheduler.c
+++ b/src/gsb_scheduler.c
@@ -481,8 +481,8 @@ void gsb_scheduler_check_scheduled_transactions_time_limit ( void )
{
gint last_day;
- last_day = g_date_get_days_in_month ( g_date_month (date),
- g_date_year (date));
+ last_day = g_date_get_days_in_month ( g_date_get_month (date),
+ g_date_get_year (date));
g_date_set_day (date, last_day);
}
diff --git a/src/qif.c b/src/qif.c
index 5831240..f1fcf0e 100644
--- a/src/qif.c
+++ b/src/qif.c
@@ -1012,9 +1012,9 @@ gboolean qif_export ( const gchar *filename,
/* this is the beginning of the qif file, we set some beginnings things */
fprintf ( fichier_qif,
"D%d/%d/%d\n",
- g_date_day (gsb_data_transaction_get_date (transaction_number_tmp)),
- g_date_month (gsb_data_transaction_get_date (transaction_number_tmp)),
- g_date_year (gsb_data_transaction_get_date (transaction_number_tmp)));
+ g_date_get_day (gsb_data_transaction_get_date (transaction_number_tmp)),
+ g_date_get_month (gsb_data_transaction_get_date (transaction_number_tmp)),
+ g_date_get_year (gsb_data_transaction_get_date (transaction_number_tmp)));
/* met le solde initial */
tmpstr = gsb_real_get_string (gsb_data_account_get_init_balance (account_nb, -1));
@@ -1046,9 +1046,9 @@ gboolean qif_export ( const gchar *filename,
fprintf ( fichier_qif,
"D%d/%d/%d\n",
- g_date_day (gsb_data_transaction_get_date (transaction_number_tmp)),
- g_date_month (gsb_data_transaction_get_date (transaction_number_tmp)),
- g_date_year (gsb_data_transaction_get_date (transaction_number_tmp)));
+ g_date_get_day (gsb_data_transaction_get_date (transaction_number_tmp)),
+ g_date_get_month (gsb_data_transaction_get_date (transaction_number_tmp)),
+ g_date_get_year (gsb_data_transaction_get_date (transaction_number_tmp)));
/* met le pointage */
hooks/post-receive
--
grisbi
More information about the cvs
mailing list