diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/calendar.c | 13 | ||||
| -rw-r--r-- | calendar/gui/calendar.c | 13 | ||||
| -rw-r--r-- | calendar/gui/prop.c | 4 | ||||
| -rw-r--r-- | calendar/prop.c | 4 |
5 files changed, 38 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c3be35257a..6b432cb781 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +1999-02-22 Timur Bakeyev <mc@bat.ru> + + * calendar.c: According to configured values, use either tm.tm_zone + or tzname. In last case, also declare it extern. + + * prop.c: langinfo.h not available everywhere. Wrapped. BTW, works + fine without it. + 1999-02-20 Tomas Ogren <stric@ing.umu.se> * main.c (init_username): Made use of g_get_{user,real}_name() instead diff --git a/calendar/calendar.c b/calendar/calendar.c index b451703e8a..024e2d0116 100644 --- a/calendar/calendar.c +++ b/calendar/calendar.c @@ -20,6 +20,10 @@ #include "timeutil.h" #include "../libversit/vcc.h" +#ifdef HAVE_TZNAME +extern char *tzname[2]; +#endif + /* Our day range */ time_t calendar_day_begin, calendar_day_end; @@ -325,16 +329,21 @@ calendar_save (Calendar *cal, char *fname) GList *l; time_t now = time (NULL); struct stat s; + struct tm *tm; if (fname == NULL) fname = cal->filename; /* WE call localtime for the side effect of setting tzname */ - localtime (&now); + tm = localtime (&now); vcal = newVObject (VCCalProp); addPropValue (vcal, VCProdIdProp, "-//GNOME//NONSGML GnomeCalendar//EN"); - addPropValue (vcal, VCTimeZoneProp, tzname [0]); +#if defined(HAVE_TM_ZONE) + addPropValue (vcal, VCTimeZoneProp, tm->tm_zone); +#elif defined(HAVE_TZNAME) + addPropValue (vcal, VCTimeZoneProp, tzname[0]); +#endif addPropValue (vcal, VCVersionProp, VERSION); cal->temp = vcal; diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c index b451703e8a..024e2d0116 100644 --- a/calendar/gui/calendar.c +++ b/calendar/gui/calendar.c @@ -20,6 +20,10 @@ #include "timeutil.h" #include "../libversit/vcc.h" +#ifdef HAVE_TZNAME +extern char *tzname[2]; +#endif + /* Our day range */ time_t calendar_day_begin, calendar_day_end; @@ -325,16 +329,21 @@ calendar_save (Calendar *cal, char *fname) GList *l; time_t now = time (NULL); struct stat s; + struct tm *tm; if (fname == NULL) fname = cal->filename; /* WE call localtime for the side effect of setting tzname */ - localtime (&now); + tm = localtime (&now); vcal = newVObject (VCCalProp); addPropValue (vcal, VCProdIdProp, "-//GNOME//NONSGML GnomeCalendar//EN"); - addPropValue (vcal, VCTimeZoneProp, tzname [0]); +#if defined(HAVE_TM_ZONE) + addPropValue (vcal, VCTimeZoneProp, tm->tm_zone); +#elif defined(HAVE_TZNAME) + addPropValue (vcal, VCTimeZoneProp, tzname[0]); +#endif addPropValue (vcal, VCVersionProp, VERSION); cal->temp = vcal; diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c index 345c07fe96..2f24f4551e 100644 --- a/calendar/gui/prop.c +++ b/calendar/gui/prop.c @@ -6,7 +6,11 @@ * Federico Mena <federico@nuclecu.unam.mx> */ #include <config.h> +#ifdef HAVE_LANGINGO_H #include <langinfo.h> +#else +#include <locale.h> +#endif #include <gnome.h> #include "gnome-cal.h" #include "gnome-month-item.h" diff --git a/calendar/prop.c b/calendar/prop.c index 345c07fe96..2f24f4551e 100644 --- a/calendar/prop.c +++ b/calendar/prop.c @@ -6,7 +6,11 @@ * Federico Mena <federico@nuclecu.unam.mx> */ #include <config.h> +#ifdef HAVE_LANGINGO_H #include <langinfo.h> +#else +#include <locale.h> +#endif #include <gnome.h> #include "gnome-cal.h" #include "gnome-month-item.h" |