1 files changed, 5 insertions, 26 deletions

diff --git a/src/common.c b/src/common.c
index 844dafdf..55dbc0f9 100644
--- a/src/common.c
+++ b/src/common.c
@@ -75,24 +75,10 @@ GNUNET_GTK_get_expiration_time (GtkSpinButton *spin)
 {
   struct GNUNET_TIME_Absolute ret;
   int year;
-  time_t tp;
-  struct tm t;
 
   year = gtk_spin_button_get_value_as_int (spin);
-  memset (&t, 0, sizeof (t));
-  if (year < 1900)
-    {
-      GNUNET_break (0);
-      return GNUNET_TIME_absolute_get (); /* now */
-    }
-  t.tm_year = year - 1900;
-  t.tm_mday = 1;
-  t.tm_mon = 1;
-  t.tm_wday = 1;
-  t.tm_yday = 1;
-  tp = mktime (&t);
-  GNUNET_break (tp != (time_t) -1);
-  ret.abs_value = tp * 1000LL; /* seconds to ms */
+  GNUNET_assert (year >= 0);
+  ret = GNUNET_FS_year_to_time ( (unsigned int) year);
   GNUNET_break (GNUNET_TIME_absolute_get ().abs_value < ret.abs_value);
   return ret;
 }
@@ -102,16 +88,9 @@ void
 GNUNET_GTK_setup_expiration_year_adjustment (GtkBuilder *builder)
 {
   GtkAdjustment *aj;
-  struct tm *t;
-  int year;
-  time_t tp;
-
-  tp = time (NULL);
-  t = gmtime (&tp);
-  if (t == NULL)
-    year = 0;
-  else
-    year = t->tm_year + 1900;
+  unsigned int year;
+
+  year = GNUNET_FS_get_current_year ();
   aj = GTK_ADJUSTMENT (gtk_builder_get_object (builder,
                                                "expiration_year_adjustment"));
   gtk_adjustment_set_value (aj, year + 2);