aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-05-31 11:47:45 +0000
committerChristian Grothoff <christian@grothoff.org>2012-05-31 11:47:45 +0000
commitec2df13cf1f3ebf3362b80d9d826312926b5ad3f (patch)
tree77024d1289d3f8d00ca79fa61161f1ec2a331ff6
parent26a93039a26d1061dbff024c280cae54d0ccac20 (diff)
downloadgnunet-gtk-ec2df13cf1f3ebf3362b80d9d826312926b5ad3f.tar.gz
gnunet-gtk-ec2df13cf1f3ebf3362b80d9d826312926b5ad3f.zip
-fix build issues
-rw-r--r--src/gns/gnunet-gns-gtk.c2
-rw-r--r--src/gns/gnunet-gns-gtk_zone.c18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 05e74874..db58a0f7 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -241,7 +241,7 @@ GNUNET_GNS_GTK_pseu_entry_changed_cb (GtkEditable *editable,
241 { 241 {
242 242
243 rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU; 243 rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
244 rd.expiration = GNUNET_TIME_absolute_get_forever(); 244 rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
245 rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; 245 rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
246 rd.data_size = strlen (pseu) + 1; 246 rd.data_size = strlen (pseu) + 1;
247 rd.data = strdup (pseu); 247 rd.data = strdup (pseu);
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index b6ca586c..d526235c 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -240,7 +240,7 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path, cha
240 GNUNET_free_non_null (rd); 240 GNUNET_free_non_null (rd);
241 } 241 }
242 rd[records - 1].record_type = GNUNET_NAMESTORE_TYPE_PSEU; 242 rd[records - 1].record_type = GNUNET_NAMESTORE_TYPE_PSEU;
243 rd[records - 1].expiration = GNUNET_TIME_absolute_get_forever(); 243 rd[records - 1].expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
244 rd[records - 1].flags = GNUNET_NAMESTORE_RF_AUTHORITY | GNUNET_NAMESTORE_RF_NONE; 244 rd[records - 1].flags = GNUNET_NAMESTORE_RF_AUTHORITY | GNUNET_NAMESTORE_RF_NONE;
245 } 245 }
246 else 246 else
@@ -453,7 +453,7 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
453 TREE_COL_RECORD_TYPE, type, 453 TREE_COL_RECORD_TYPE, type,
454 TREE_COL_RECORD_TYPE_AS_STR, type_str, 454 TREE_COL_RECORD_TYPE_AS_STR, type_str,
455 TREE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING, 455 TREE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING,
456 TREE_COL_EXP_TIME, GNUNET_TIME_absolute_get_forever(), 456 TREE_COL_EXP_TIME, GNUNET_TIME_UNIT_FOREVER_ABS,
457 TREE_COL_EXP_TIME_IS_REL, FALSE, 457 TREE_COL_EXP_TIME_IS_REL, FALSE,
458 TREE_COL_IS_RECORD_ROW, GNUNET_YES, 458 TREE_COL_IS_RECORD_ROW, GNUNET_YES,
459 TREE_COL_NOT_DUMMY_ROW, GNUNET_YES, 459 TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
@@ -574,19 +574,19 @@ const struct GNUNET_TIME_Absolute convert_string_to_abs_time (const char * text)
574 GNUNET_assert (NULL != text); 574 GNUNET_assert (NULL != text);
575 575
576 if (0 == strcmp(text, EXPIRE_NEVER_STRING)) 576 if (0 == strcmp(text, EXPIRE_NEVER_STRING))
577 return GNUNET_TIME_absolute_get_forever(); 577 return GNUNET_TIME_UNIT_FOREVER_ABS;
578 578
579 memset (&time, '\0', sizeof (struct tm)); 579 memset (&time, '\0', sizeof (struct tm));
580 580
581 if (GNUNET_SYSERR == check_time(text)) 581 if (GNUNET_SYSERR == check_time(text))
582 { 582 {
583 GNUNET_break (0); 583 GNUNET_break (0);
584 return GNUNET_TIME_absolute_get_zero(); 584 return GNUNET_TIME_UNIT_ZERO_ABS;
585 } 585 }
586 586
587 int count = SSCANF (text, "%02d/%02d/%04d %02d:%02d", &t_mon, &t_day, &t_year, &t_hrs, &t_min); 587 int count = SSCANF (text, "%02d/%02d/%04d %02d:%02d", &t_mon, &t_day, &t_year, &t_hrs, &t_min);
588 if ((EOF == count) || (5 != count)) 588 if ((EOF == count) || (5 != count))
589 return GNUNET_TIME_absolute_get_zero(); 589 return GNUNET_TIME_UNIT_ZERO_ABS;
590 590
591 time.tm_mon = (t_mon - 1); 591 time.tm_mon = (t_mon - 1);
592 time.tm_mday = t_day; 592 time.tm_mday = t_day;
@@ -596,7 +596,7 @@ const struct GNUNET_TIME_Absolute convert_string_to_abs_time (const char * text)
596 596
597 t = mktime (&time); 597 t = mktime (&time);
598 if (-1 == t) 598 if (-1 == t)
599 return GNUNET_TIME_absolute_get_zero(); 599 return GNUNET_TIME_UNIT_ZERO_ABS;
600 600
601 abs_t.abs_value = t * 1000; 601 abs_t.abs_value = t * 1000;
602 602
@@ -637,7 +637,7 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
637 if ((0 == strcmp(new_text,"")) || (0 == strcmp(new_text,EXPIRE_NEVER_STRING))) 637 if ((0 == strcmp(new_text,"")) || (0 == strcmp(new_text,EXPIRE_NEVER_STRING)))
638 { 638 {
639 new_text = EXPIRE_NEVER_STRING; 639 new_text = EXPIRE_NEVER_STRING;
640 abstime = GNUNET_TIME_absolute_get_forever(); 640 abstime = GNUNET_TIME_UNIT_FOREVER_ABS;
641 } 641 }
642 else 642 else
643 { 643 {
@@ -648,7 +648,7 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
648 TREE_COL_EXP_TIME_COLOR, "red", 648 TREE_COL_EXP_TIME_COLOR, "red",
649 TREE_COL_EXP_TIME, 0, 649 TREE_COL_EXP_TIME, 0,
650 -1); 650 -1);
651 abstime = GNUNET_TIME_absolute_get_zero(); 651 abstime = GNUNET_TIME_UNIT_ZERO_ABS;
652 return; 652 return;
653 } 653 }
654 /* TODO: fix this when we have relative time */ 654 /* TODO: fix this when we have relative time */
@@ -1057,7 +1057,7 @@ zone_iteration_proc (void *cls,
1057 if (GNUNET_YES == time_is_relative) 1057 if (GNUNET_YES == time_is_relative)
1058 { 1058 {
1059 /* TODO: FIX THIS WHEN WE HAVE RELATIVE TIME */ 1059 /* TODO: FIX THIS WHEN WE HAVE RELATIVE TIME */
1060 struct GNUNET_TIME_Relative rel_time = GNUNET_TIME_relative_get_zero(); 1060 struct GNUNET_TIME_Relative rel_time = GNUNET_TIME_UNIT_ZERO;
1061 struct GNUNET_TIME_Absolute exp_abs; 1061 struct GNUNET_TIME_Absolute exp_abs;
1062 exp_abs = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), rel_time); 1062 exp_abs = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), rel_time);
1063 exp_t = exp_abs.abs_value; 1063 exp_t = exp_abs.abs_value;