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

[gnunet]

Author: wachs
Date: 2012-03-20 14:31:35 +0100 (Tue, 20 Mar 2012)
New Revision: 20631

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
   gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- updating zone


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-20 13:26:00 UTC (rev 20630)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-20 13:31:35 UTC (rev 20631)
@@ -77,7 +77,21 @@
                  int32_t success,
                  const char *emsg)
 {
-  GNUNET_break (0);
+  GtkWidget *dialog;
+  if (GNUNET_SYSERR == success)
+  {
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("New Pseudonym could not be set: 
`%s'\n"), emsg);
+  dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_ERROR,
+                                   GTK_BUTTONS_CLOSE,
+                                   _("New Pseudonym could not be set: `%s'\n"),
+                                   emsg);
+    g_signal_connect_swapped (dialog, "response",
+                              G_CALLBACK (gtk_widget_destroy),
+                              dialog);
+    gtk_widget_show_all (dialog);
+  }
 }
 
 
@@ -140,13 +154,14 @@
   pseu = gtk_entry_get_text (GTK_ENTRY(editable));
   if ((pseu != NULL) && (0 != strcmp ("", pseu)))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New Pseudonym is `%s'\n", pseu);
-    rd.flags = GNUNET_NAMESTORE_TYPE_PSEU;
+
+    rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
     rd.expiration = GNUNET_TIME_absolute_get_forever();
     rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
     rd.data_size = strlen (pseu) + 1;
     rd.data = strdup (pseu);
     GNUNET_NAMESTORE_record_create(gns->ns, gns->pkey, "+", &rd, 
pseu_change_cont, gns);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New Pseudonym is `%s' %u\n", (char 
*) rd.data, rd.data_size);
   }
 }
 

Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-20 13:26:00 UTC (rev 
20630)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-20 13:31:35 UTC (rev 
20631)
@@ -371,6 +371,7 @@
   struct ZoneIteration_Context * zc_ctx = cls;
   GtkTreeIter iter_name;
   GtkTreeIter iter_record;
+  GtkEntry *pseu_entry;
   int c;
   int time_is_relative;
 
@@ -383,24 +384,43 @@
   {
     struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
     GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n", &shenc);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone `%s 'iteration done\n", &shenc);
     GNUNET_free (zc_ctx);
     return;
   }
 
+
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
   GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s' iteration result `%s', %u 
records\n",
-      shenc, name, rd_count);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone `%s' iteration result `%s', %u 
records\n",
+      &shenc, name, rd_count);
 
+  if (0 == strcmp(name, "+"))
+  {
+    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))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    if (rd->data_size == 0)
+    {
+      GNUNET_break(0);
+      return;
+    }
+
+    if (((char *)rd->data)[rd->data_size-1] != '\0')
+    {
+      GNUNET_break(0);
+      return;
+    }
+    gtk_entry_set_text (pseu_entry, (char *)rd[0].data);
+    return;
+  }
+
   GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
   gtk_tree_store_append(zc_ctx->gns->ts, &iter_name, NULL);
-  /*
-  GtkCellRenderer *renderer ;
-  g_object_set(renderer,
-               "editable", FALSE,
-               NULL);
-*/
   gtk_tree_store_set(zc_ctx->gns->ts, &iter_name,
                      TREE_COL_NAME, name,
                      TREE_COL_NAME_IS_EDITABLE, 1,