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

[gnunet]

Author: wachs
Date: 2012-04-02 10:53:01 +0200 (Mon, 02 Apr 2012)
New Revision: 20841

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
Log:
- merge conflicts


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-04-02 08:32:18 UTC (rev 20840)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-04-02 08:53:01 UTC (rev 20841)
@@ -246,12 +246,11 @@
     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_ERROR, "New Pseudonym is `%s' %u\n", (char 
*) rd.data, rd.data_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New Pseudonym is `%s' %u\n", (char 
*) rd.data, rd.data_size);
   }
   else if ((0 != strcmp (pseu, PSEU_EMPTY_STR)) && ((pseu == NULL) || (0 == 
strcmp ("", pseu))))
   {
     gtk_entry_set_text (GTK_ENTRY(editable), PSEU_EMPTY_STR);
-    GNUNET_break (0);
   }
 
 }
@@ -336,7 +335,6 @@
 
   /* FIXME: move to new zone 'filename' */
   fprintf (stderr, "Got zone `%s'\n", filename);
-  gns++; // fix compiler warning
   GNUNET_free (filename);  
 }