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

[gnunet]

Author: wachs
Date: 2012-03-22 18:52:14 +0100 (Thu, 22 Mar 2012)
New Revision: 20682

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- fix in format


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-22 17:52:00 UTC (rev 
20681)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-22 17:52:14 UTC (rev 
20682)
@@ -74,6 +74,7 @@
   {
      for (c = 0; c < uc->rd_count; c++)
      {
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New text for  is `%s'\n", 
uc->rd[c].data);
        GNUNET_NAMESTORE_record_create(uc->gns->ns, uc->gns->pkey,
            uc->name, &uc->rd[c],NULL, NULL);
        GNUNET_free ((void *) uc->rd[c].data);
@@ -106,6 +107,8 @@
   int c;
   int valid = GNUNET_YES;
   char * name;
+  void * data;
+  size_t data_size;
 
   char          *n_name;
   int           n_type;
@@ -173,6 +176,11 @@
     /* valid value */
     if ((n_value_color != NULL) || (NULL == n_value))
         valid = GNUNET_NO;
+    if (NULL != n_value)
+    {
+      if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value(n_type, n_value, 
&data, &data_size))
+        valid = GNUNET_NO;
+    }
 
     if (GNUNET_YES == valid)
     {
@@ -182,9 +190,9 @@
         rd[c].flags = GNUNET_NAMESTORE_RF_AUTHORITY | GNUNET_NAMESTORE_RF_NONE;
       rd[c].record_type = n_type;
       rd[c].expiration.abs_value = n_exp_time;
-      rd[c].data_size = strlen (n_value) + 1;
-      rd[c].data = GNUNET_malloc(rd[c].data_size);
-      memcpy ((void *) rd[c].data, n_value, rd[c].data_size);
+      rd[c].data_size = data_size;
+      rd[c].data = GNUNET_malloc(data_size);
+      memcpy ((void *) rd[c].data, data, data_size);
     }
     g_free (n_name);
     g_free (n_exp_color);
@@ -370,8 +378,8 @@
   void *data;
   size_t data_size;
 
-  gtk_tree_model_get(gns->tm, new_iter, 0, &type, -1);
-  gtk_tree_model_get(gns->tm, new_iter, TYPE_LIST_TYPENAME, &type_str, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, 0, &type, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, TYPE_LIST_TYPENAME, 
&type_str, -1);
 
 
   /* check if this is a new record */
@@ -651,6 +659,7 @@
     {
       gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, NULL, -1);
       gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_AS_STR, new_text, -1);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New text for `%s' is `%s'\n", 
path, new_text);
       check_name_validity_and_commit (gns, path);
     }
     else
@@ -915,6 +924,8 @@
   char *val;
   int public;
   guint64 exp_t;
+GNUNET_break(0);
+GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s'\n", name);
 
   GNUNET_assert (zc_ctx != NULL);
   if ((NULL == zone_key) && (NULL == name))
@@ -936,7 +947,7 @@
   {
     pseu_entry = GTK_ENTRY((gtk_builder_get_object (zc_ctx->gns->builder, 
"GNUNET_GNS_GTK_pseu_entry")));
     GNUNET_assert (pseu_entry != NULL);
-    if ((rd == NULL) || (rd_count == 0))
+    if ((rd == NULL) || (rd_count != 1))
     {
       GNUNET_break (0);
       return;
@@ -947,12 +958,11 @@
       return;
     }
 
-    if (((char *)rd->data)[rd->data_size-1] != '\0')
-    {
-      GNUNET_break(0);
-      return;
-    }
-    gtk_entry_set_text (pseu_entry, (char *)rd[0].data);
+    val = GNUNET_NAMESTORE_value_to_string (rd[0].record_type,
+                                            rd[0].data,
+                                            rd[0].data_size);
+    gtk_entry_set_text (pseu_entry, val);
+    GNUNET_free (val);
     GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
     return;
   }
@@ -1022,6 +1032,7 @@
                                        TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                                        -1);
     GNUNET_free (exp);
+    GNUNET_free_non_null (val);
   }
 
   GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);