diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-11 02:11:48 +0800 |
commit | 31fd01398cc76d3c00abbc05d419dfe873bc04c6 (patch) | |
tree | 35c238cdb2a8a68936fa659e5269e75ee0042b49 /widgets/misc/e-dateedit.c | |
parent | f9049cded460a9e316fa83ff1941970abfe0fd09 (diff) | |
parent | 10fef4ac0f4ef7dc907e8bfae9844d4e8be3d80d (diff) | |
download | gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.gz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.bz2 gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.lz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.xz gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.tar.zst gsoc2013-evolution-31fd01398cc76d3c00abbc05d419dfe873bc04c6.zip |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/util/addressbook.h
calendar/gui/e-week-view-main-item.c
configure.ac
e-util/Makefile.am
mail/em-account-editor.c
mail/em-folder-selection-button.c
shell/e-shell.c
Diffstat (limited to 'widgets/misc/e-dateedit.c')
-rw-r--r-- | widgets/misc/e-dateedit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 84b016934e..1d69016b20 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1729,12 +1729,18 @@ e_date_edit_update_date_entry (EDateEdit *dedit) %x the preferred date representation for the current locale without the time, but has forced to use 4 digit year */ gchar *format = e_time_get_d_fmt_with_4digit_year (); + time_t tt; tmp_tm.tm_year = priv->year; tmp_tm.tm_mon = priv->month; tmp_tm.tm_mday = priv->day; tmp_tm.tm_isdst = -1; + /* initialize all 'struct tm' members properly */ + tt = mktime (&tmp_tm); + if (tt && localtime (&tt)) + tmp_tm = *localtime (&tt); + e_utf8_strftime (buffer, sizeof (buffer), format, &tmp_tm); g_free (format); gtk_entry_set_text (GTK_ENTRY (priv->date_entry), buffer); |