[GNUnet-SVN] r21652 - gnunet-gtk/src/gns

[gnunet]

Author: grothoff
Date: 2012-05-31 13:47:45 +0200 (Thu, 31 May 2012)
New Revision: 21652

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
   gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
-fix build issues

Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-05-31 11:36:24 UTC (rev 21651)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-05-31 11:47:45 UTC (rev 21652)
@@ -241,7 +241,7 @@
   {
 
     rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
-    rd.expiration = GNUNET_TIME_absolute_get_forever();
+    rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
     rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
     rd.data_size = strlen (pseu) + 1;
     rd.data = strdup (pseu);

Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-05-31 11:36:24 UTC (rev 
21651)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-05-31 11:47:45 UTC (rev 
21652)
@@ -240,7 +240,7 @@
           GNUNET_free_non_null (rd);
         }
         rd[records - 1].record_type = GNUNET_NAMESTORE_TYPE_PSEU;
-        rd[records - 1].expiration = GNUNET_TIME_absolute_get_forever();
+        rd[records - 1].expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
         rd[records - 1].flags = GNUNET_NAMESTORE_RF_AUTHORITY | 
GNUNET_NAMESTORE_RF_NONE;
       }
       else
@@ -453,7 +453,7 @@
         TREE_COL_RECORD_TYPE, type,
         TREE_COL_RECORD_TYPE_AS_STR, type_str,
         TREE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING,
-        TREE_COL_EXP_TIME, GNUNET_TIME_absolute_get_forever(),
+       TREE_COL_EXP_TIME, GNUNET_TIME_UNIT_FOREVER_ABS,
         TREE_COL_EXP_TIME_IS_REL, FALSE,
         TREE_COL_IS_RECORD_ROW, GNUNET_YES,
         TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
@@ -574,19 +574,19 @@
   GNUNET_assert (NULL != text);
 
   if (0 == strcmp(text, EXPIRE_NEVER_STRING))
-    return GNUNET_TIME_absolute_get_forever();
+    return GNUNET_TIME_UNIT_FOREVER_ABS;
 
   memset (&time, '\0', sizeof (struct tm));
 
   if (GNUNET_SYSERR == check_time(text))
   {
     GNUNET_break (0);
-    return GNUNET_TIME_absolute_get_zero();
+    return GNUNET_TIME_UNIT_ZERO_ABS;
   }
 
   int count = SSCANF (text, "%02d/%02d/%04d %02d:%02d", &t_mon, &t_day, 
&t_year, &t_hrs, &t_min);
   if ((EOF == count) || (5 != count))
-    return GNUNET_TIME_absolute_get_zero();
+    return GNUNET_TIME_UNIT_ZERO_ABS;
 
   time.tm_mon = (t_mon - 1);
   time.tm_mday = t_day;
@@ -596,7 +596,7 @@
 
   t = mktime (&time);
   if (-1 == t)
-    return GNUNET_TIME_absolute_get_zero();
+    return GNUNET_TIME_UNIT_ZERO_ABS;
 
   abs_t.abs_value = t * 1000;
 
@@ -637,7 +637,7 @@
     if ((0 == strcmp(new_text,"")) || (0 == 
strcmp(new_text,EXPIRE_NEVER_STRING)))
     {
       new_text = EXPIRE_NEVER_STRING;
-      abstime = GNUNET_TIME_absolute_get_forever();
+      abstime = GNUNET_TIME_UNIT_FOREVER_ABS;
     }
     else
     {
@@ -648,7 +648,7 @@
                             TREE_COL_EXP_TIME_COLOR, "red",
                             TREE_COL_EXP_TIME, 0,
                             -1);
-        abstime = GNUNET_TIME_absolute_get_zero();
+        abstime = GNUNET_TIME_UNIT_ZERO_ABS;
         return;
       }
       /* TODO: fix this when we have relative time */
@@ -1057,7 +1057,7 @@
     if (GNUNET_YES == time_is_relative)
     {
       /* TODO: FIX THIS WHEN WE HAVE RELATIVE TIME */
-      struct GNUNET_TIME_Relative rel_time = GNUNET_TIME_relative_get_zero();
+      struct GNUNET_TIME_Relative rel_time = GNUNET_TIME_UNIT_ZERO;
       struct GNUNET_TIME_Absolute exp_abs;
       exp_abs = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), rel_time);
       exp_t = exp_abs.abs_value;