diff options
Diffstat (limited to 'src/gns/gnunet-gns-gtk.c')
-rw-r--r-- | src/gns/gnunet-gns-gtk.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c index a4c6cac0..c7b47363 100644 --- a/src/gns/gnunet-gns-gtk.c +++ b/src/gns/gnunet-gns-gtk.c | |||
@@ -288,6 +288,7 @@ static void | |||
288 | run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 288 | run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
289 | { | 289 | { |
290 | struct GNUNET_GNS_Context *gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context)); | 290 | struct GNUNET_GNS_Context *gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context)); |
291 | struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc; | ||
291 | char *keyfile; | 292 | char *keyfile; |
292 | char *label; | 293 | char *label; |
293 | 294 | ||
@@ -296,7 +297,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
296 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (), | 297 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (), |
297 | "gns", | 298 | "gns", |
298 | "ZONEKEY_DIRECTORY", | 299 | "ZONEKEY_DIRECTORY", |
299 | &zonekey_directory)) | 300 | &zonekey_direc struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc; |
301 | GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);tory)) | ||
300 | { | 302 | { |
301 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 303 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
302 | _("Option `%s' missing in section `%s'\n"), | 304 | _("Option `%s' missing in section `%s'\n"), |
@@ -315,10 +317,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
315 | return; | 317 | return; |
316 | } | 318 | } |
317 | else | 319 | else |
318 | { | 320 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
319 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
320 | "Using `%s'\n", keyfile); | 321 | "Using `%s'\n", keyfile); |
321 | } | ||
322 | gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); | 322 | gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile); |
323 | GNUNET_free (keyfile); | 323 | GNUNET_free (keyfile); |
324 | keyfile = NULL; | 324 | keyfile = NULL; |
@@ -329,7 +329,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
329 | return; | 329 | return; |
330 | } | 330 | } |
331 | GNUNET_CRYPTO_rsa_key_get_public (gns->pkey, &gns->pubkey); | 331 | GNUNET_CRYPTO_rsa_key_get_public (gns->pkey, &gns->pubkey); |
332 | GNUNET_CRYPTO_hash (&gns->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone); | 332 | GNUNET_CRYPTO_short_hash (&gns->pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone); |
333 | 333 | ||
334 | 334 | ||
335 | gns->ns = GNUNET_NAMESTORE_connect (get_configuration ()); | 335 | gns->ns = GNUNET_NAMESTORE_connect (get_configuration ()); |
@@ -352,7 +352,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
352 | gns->ls = GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore")); | 352 | gns->ls = GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore")); |
353 | GNUNET_assert (NULL != gns->ts); | 353 | GNUNET_assert (NULL != gns->ts); |
354 | 354 | ||
355 | zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&gns->zone)); | 355 | GNUNET_CRYPTO_short_hash_to_enc(&gns->zone, &shenc); |
356 | zone_as_string = GNUNET_strdup ((char *) &shenc); | ||
356 | label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"), | 357 | label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"), |
357 | zone_as_string); | 358 | zone_as_string); |
358 | gtk_label_set_markup (GTK_LABEL (get_object ("GNUNET_GNS_GTK_zone_label")), | 359 | gtk_label_set_markup (GTK_LABEL (get_object ("GNUNET_GNS_GTK_zone_label")), |