IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correct inadvertent change to a still-needed function.

Browse Source
This commit is contained in:
John Ralls 2014-12-14 16:36:53 -08:00
parent 620832f481
commit 08a4394955
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libqof/qof/gnc-date.c
View File

@ -126,7 +126,7 @@ gnc_g_date_time_new_local (gint year, gint month, gint day, gint hour, gint minu
} }
static GDateTime* static GDateTime*
g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz) gnc_g_date_time_adjust_for_dst (GDateTime *gdt, GTimeZone *tz)
{ {
GDateTime *ngdt; GDateTime *ngdt;
g_return_val_if_fail (gdt != NULL, NULL); g_return_val_if_fail (gdt != NULL, NULL);
@ -142,6 +142,8 @@ gnc_g_date_time_new_from_unix_local (time64 time)
{ {
GTimeZone *tz = gnc_g_time_zone_new_local (); GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_from_unix_utc (time); GDateTime *gdt = g_date_time_new_from_unix_utc (time);
if (gdt)
gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt; return gdt;
} }
@ -151,7 +153,7 @@ gnc_g_date_time_new_from_timeval_local (const GTimeVal* tv)
GTimeZone *tz = gnc_g_time_zone_new_local (); GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_from_timeval_utc (tv); GDateTime *gdt = g_date_time_new_from_timeval_utc (tv);
if (gdt) if (gdt)
gdt = g_date_time_adjust_for_dst (gdt, tz); gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt; return gdt;
} }
@ -161,7 +163,7 @@ gnc_g_date_time_new_now_local (void)
GTimeZone *tz = gnc_g_time_zone_new_local (); GTimeZone *tz = gnc_g_time_zone_new_local ();
GDateTime *gdt = g_date_time_new_now_utc (); GDateTime *gdt = g_date_time_new_now_utc ();
if (gdt) if (gdt)
gdt = g_date_time_adjust_for_dst (gdt, tz); gdt = gnc_g_date_time_adjust_for_dst (gdt, tz);
return gdt; return gdt;
} }
@ -173,7 +175,7 @@ gnc_g_date_time_to_local (GDateTime* gdt)
if (gdt) if (gdt)
{ {
tz = gnc_g_time_zone_new_local (); tz = gnc_g_time_zone_new_local ();
gdt = g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz); gdt = gnc_g_date_time_adjust_for_dst (g_date_time_to_utc (gdt), tz);
} }
return gdt; return gdt;
} }
@ -193,7 +195,7 @@ void
_gnc_date_time_init (_GncDateTime *gncdt) _gnc_date_time_init (_GncDateTime *gncdt)
{ {
gncdt->new_local = gnc_g_date_time_new_local; gncdt->new_local = gnc_g_date_time_new_local;
gncdt->adjust_for_dst = g_date_time_adjust_for_dst; gncdt->adjust_for_dst = gnc_g_date_time_adjust_for_dst;
gncdt->new_from_unix_local = gnc_g_date_time_new_from_unix_local; gncdt->new_from_unix_local = gnc_g_date_time_new_from_unix_local;
gncdt->new_from_timeval_local = gnc_g_date_time_new_from_timeval_local; gncdt->new_from_timeval_local = gnc_g_date_time_new_from_timeval_local;
gncdt->new_now_local = gnc_g_date_time_new_now_local; gncdt->new_now_local = gnc_g_date_time_new_now_local;