[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20696 - gnunet-gtk/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20696 - gnunet-gtk/src/gns |
Date: |
Thu, 22 Mar 2012 20:07:50 +0100 |
Author: wachs
Date: 2012-03-22 20:07:50 +0100 (Thu, 22 Mar 2012)
New Revision: 20696
Modified:
gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- fix
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-22 19:01:43 UTC (rev
20695)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-22 19:07:50 UTC (rev
20696)
@@ -936,6 +936,7 @@
char *exp;
char *val;
+ char * type_str;
int public;
guint64 exp_t;
@@ -946,7 +947,9 @@
GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone `%s 'iteration done\n", &shenc);
pseu_entry = GTK_ENTRY((gtk_builder_get_object (zc_ctx->gns->builder,
"GNUNET_GNS_GTK_pseu_entry")));
- GNUNET_assert (zc_ctx->label != NULL);
+ if (zc_ctx->label == NULL)
+ GNUNET_asprintf(&zc_ctx->label, "%s", EXPIRE_INVALID_STRING);
+
gtk_entry_set_text (pseu_entry, zc_ctx->label);
GNUNET_free (zc_ctx->label);
GNUNET_free (zc_ctx);
@@ -959,28 +962,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone `%s' iteration result `%s', %u
records\n",
&shenc, name, rd_count);
- if (0 == strcmp(name, "+"))
- {
-
- if ((rd == NULL) || (rd_count != 1))
- {
- GNUNET_break (0);
- return;
- }
- if (rd->data_size == 0)
- {
- GNUNET_break(0);
- return;
- }
-
- val = GNUNET_NAMESTORE_value_to_string (rd[0].record_type,
- rd[0].data,
- rd[0].data_size);
- zc_ctx->label = val;
- GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
- return;
- }
-
GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
gtk_tree_store_append(zc_ctx->gns->ts, &iter_name, NULL);
gtk_tree_store_set(zc_ctx->gns->ts, &iter_name,
@@ -1032,11 +1013,21 @@
val = GNUNET_NAMESTORE_value_to_string (rd[c].record_type,
rd[c].data,
rd[c].data_size);
+ if (NULL == val)
+ GNUNET_asprintf(val, "%s", EXPIRE_INVALID_STRING);
+
+ type_str = GNUNET_NAMESTORE_number_to_typename(rd[c].record_type);
+ if (NULL == type_str)
+ GNUNET_asprintf(type_str, "%s", EXPIRE_INVALID_STRING);
+
+ if (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type)
+ zc_ctx->label = strdup(val);
+
gtk_tree_store_insert_with_values(zc_ctx->gns->ts, &iter_record ,
&iter_name, 0,
TREE_COL_NAME, name,
TREE_COL_NAME_IS_VISIBLE, FALSE,
TREE_COL_RECORD_TYPE, rd[c].record_type,
- TREE_COL_RECORD_TYPE_AS_STR,
GNUNET_NAMESTORE_number_to_typename(rd[c].record_type),
+ TREE_COL_RECORD_TYPE_AS_STR, type_str,
TREE_COL_IS_PUBLIC, public,
TREE_COL_EXP_TIME, exp_t,
TREE_COL_EXP_TIME_AS_STR, exp,
@@ -1045,8 +1036,9 @@
TREE_COL_IS_RECORD_ROW, GNUNET_YES,
TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
-1);
+
GNUNET_free (exp);
- GNUNET_free_non_null (val);
+ GNUNET_free (val);
}
GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20696 - gnunet-gtk/src/gns,
gnunet <=