[GNUnet-SVN] r29117 - in gnunet-gtk/src: fs identity lib

[gnunet]

Author: grothoff
Date: 2013-09-08 20:08:26 +0200 (Sun, 08 Sep 2013)
New Revision: 29117

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
   gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
   gnunet-gtk/src/lib/misc.c
Log:
-moving time functions from FS to TIME

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c       2013-09-08 
18:07:21 UTC (rev 29116)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-edit-dialog.c       2013-09-08 
18:08:26 UTC (rev 29117)
@@ -968,7 +968,7 @@
   bo->content_priority = gtk_spin_button_get_value (ctx->priority_spin);
   bo->replication_level = gtk_spin_button_get_value (ctx->replication_spin);
   year = gtk_spin_button_get_value (ctx->expiration_year_spin);
-  bo->expiration_time = GNUNET_FS_year_to_time (year);
+  bo->expiration_time = GNUNET_TIME_year_to_time (year);
 
   /* update keyword-URI */
   if (NULL != (*uri))
@@ -1201,7 +1201,7 @@
   int year;
 
   /* import options */
-  year = (int) GNUNET_FS_time_to_year (bo->expiration_time);
+  year = (int) GNUNET_TIME_time_to_year (bo->expiration_time);
   gtk_spin_button_set_value (ctx->expiration_year_spin, year);
   GNUNET_GTK_select_anonymity_combo_level (ctx->anonymity_combo,
                                           bo->anonymity_level);

Modified: gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c     2013-09-08 
18:07:21 UTC (rev 29116)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c     2013-09-08 
18:08:26 UTC (rev 29117)
@@ -344,13 +344,13 @@
                                                         &anonymity));
   bo.anonymity_level = anonymity;
   bo.content_priority
-    = (unsigned int) gtk_spin_buttion_get_value
+    = (unsigned int) gtk_spin_button_get_value
     (GTK_SPIN_BUTTON 
      (gtk_builder_get_object 
       (ac->builder,
        "GNUNET_GTK_identity_advertise_priority_spin_button")));
   bo.replication_level
-    = (unsigned int) gtk_spin_buttion_get_value
+    = (unsigned int) gtk_spin_button_get_value
     (GTK_SPIN_BUTTON 
      (gtk_builder_get_object 
       (ac->builder,

Modified: gnunet-gtk/src/lib/misc.c
===================================================================
--- gnunet-gtk/src/lib/misc.c   2013-09-08 18:07:21 UTC (rev 29116)
+++ gnunet-gtk/src/lib/misc.c   2013-09-08 18:08:26 UTC (rev 29117)
@@ -40,7 +40,7 @@
   GtkAdjustment *aj;
   unsigned int year;
 
-  year = GNUNET_FS_get_current_year ();
+  year = GNUNET_TIME_get_current_year ();
   aj = GTK_ADJUSTMENT (gtk_builder_get_object
                        (builder, "expiration_year_adjustment"));
   gtk_adjustment_set_value (aj, year + 2);
@@ -63,7 +63,7 @@
 
   year = gtk_spin_button_get_value_as_int (spin);
   GNUNET_assert (year >= 0);
-  ret = GNUNET_FS_year_to_time ((unsigned int) year);
+  ret = GNUNET_TIME_year_to_time ((unsigned int) year);
   GNUNET_break (GNUNET_TIME_absolute_get ().abs_value_us < ret.abs_value_us);
   return ret;
 }