diff --git a/ChangeLog b/ChangeLog index 3d0325822..f8489e369 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3d0325822..f8489e369 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1998-12-02 Havoc Pennington + + * gdate.c (g_date_set_month): If Julian is valid, we have to + update the dmy representation before setting the components + of it. + (g_date_set_day): Same. + (g_date_set_year): Same. + 1998-12-02 Havoc Pennington * testgdate.c, testgdateparser.c: Two new files. This is kind of diff --git a/gdate.c b/gdate.c index c8569fb79..69c337def 100644 --- a/gdate.c +++ b/gdate.c @@ -802,7 +802,8 @@ g_date_set_month (GDate *d, { g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_month (m)); - + + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->month = m; @@ -820,6 +821,7 @@ g_date_set_day (GDate *d, g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_day (day)); + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->day = day; @@ -837,6 +839,7 @@ g_date_set_year (GDate *d, g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_year (y)); + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->year = y; diff --git a/glib/gdate.c b/glib/gdate.c index c8569fb79..69c337def 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -802,7 +802,8 @@ g_date_set_month (GDate *d, { g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_month (m)); - + + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->month = m; @@ -820,6 +821,7 @@ g_date_set_day (GDate *d, g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_day (day)); + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->day = day; @@ -837,6 +839,7 @@ g_date_set_year (GDate *d, g_return_if_fail (d != NULL); g_return_if_fail (g_date_valid_year (y)); + if (d->julian && !d->dmy) g_date_update_dmy(d); d->julian = FALSE; d->year = y;