aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-04-02 08:53:01 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-04-02 08:53:01 +0000
commitc31c31bf8706dfa3ebe5063f2938d327b85ae1d0 (patch)
treebad6c042de72a8e2fff88ebf0f8373a990e340c0
parent5e7c0333388fce0eddbbef0f4d6949853f97cc13 (diff)
downloadgnunet-gtk-c31c31bf8706dfa3ebe5063f2938d327b85ae1d0.tar.gz
gnunet-gtk-c31c31bf8706dfa3ebe5063f2938d327b85ae1d0.zip
- merge conflicts
-rw-r--r--src/gns/gnunet-gns-gtk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index b1f85c24..05e74874 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -246,12 +246,11 @@ GNUNET_GNS_GTK_pseu_entry_changed_cb (GtkEditable *editable,
246 rd.data_size = strlen (pseu) + 1; 246 rd.data_size = strlen (pseu) + 1;
247 rd.data = strdup (pseu); 247 rd.data = strdup (pseu);
248 GNUNET_NAMESTORE_record_create(gns->ns, gns->pkey, "+", &rd, pseu_change_cont, gns); 248 GNUNET_NAMESTORE_record_create(gns->ns, gns->pkey, "+", &rd, pseu_change_cont, gns);
249 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New Pseudonym is `%s' %u\n", (char *) rd.data, rd.data_size); 249 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New Pseudonym is `%s' %u\n", (char *) rd.data, rd.data_size);
250 } 250 }
251 else if ((0 != strcmp (pseu, PSEU_EMPTY_STR)) && ((pseu == NULL) || (0 == strcmp ("", pseu)))) 251 else if ((0 != strcmp (pseu, PSEU_EMPTY_STR)) && ((pseu == NULL) || (0 == strcmp ("", pseu))))
252 { 252 {
253 gtk_entry_set_text (GTK_ENTRY(editable), PSEU_EMPTY_STR); 253 gtk_entry_set_text (GTK_ENTRY(editable), PSEU_EMPTY_STR);
254 GNUNET_break (0);
255 } 254 }
256 255
257} 256}
@@ -336,7 +335,6 @@ GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog,
336 335
337 /* FIXME: move to new zone 'filename' */ 336 /* FIXME: move to new zone 'filename' */
338 fprintf (stderr, "Got zone `%s'\n", filename); 337 fprintf (stderr, "Got zone `%s'\n", filename);
339 gns++; // fix compiler warning
340 GNUNET_free (filename); 338 GNUNET_free (filename);
341} 339}
342 340