aboutsummaryrefslogtreecommitdiff
path: root/src/namestore/gnunet-namestore-gtk.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/namestore/gnunet-namestore-gtk.c')
-rw-r--r--src/namestore/gnunet-namestore-gtk.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 9e900f62..aad4bbd2 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -267,7 +267,7 @@ struct MoveOperationContext
267 /** 267 /**
268 * Private key of target zone. 268 * Private key of target zone.
269 */ 269 */
270 struct GNUNET_CRYPTO_EcdsaPrivateKey pk; 270 struct GNUNET_IDENTITY_PrivateKey pk;
271 271
272 /** 272 /**
273 273
@@ -416,12 +416,12 @@ static GtkTreeView *tv;
416/** 416/**
417 * Private key of the zone we are currently editing. 417 * Private key of the zone we are currently editing.
418 */ 418 */
419static struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey; 419static struct GNUNET_IDENTITY_PrivateKey *pkey;
420 420
421/** 421/**
422 * Public key of the zone we are currently editing. 422 * Public key of the zone we are currently editing.
423 */ 423 */
424static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; 424static struct GNUNET_IDENTITY_PublicKey pubkey;
425 425
426/** 426/**
427 * Pseudonym of the current zone we are editing. 427 * Pseudonym of the current zone we are editing.
@@ -939,7 +939,7 @@ merge_with_existing_records (void *cls,
939 */ 939 */
940static void 940static void
941handle_records_for_merge (void *cls, 941handle_records_for_merge (void *cls,
942 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, 942 const struct GNUNET_IDENTITY_PrivateKey *zone,
943 const char *label, 943 const char *label,
944 unsigned int rd_count, 944 unsigned int rd_count,
945 const struct GNUNET_GNSRECORD_Data *rd) 945 const struct GNUNET_GNSRECORD_Data *rd)
@@ -1129,7 +1129,7 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
1129 } 1129 }
1130 else 1130 else
1131 { 1131 {
1132 const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk; 1132 const struct GNUNET_IDENTITY_PrivateKey *pk;
1133 struct MoveOperationContext *moc; 1133 struct MoveOperationContext *moc;
1134 struct GNUNET_HashCode query; 1134 struct GNUNET_HashCode query;
1135 1135
@@ -2367,7 +2367,7 @@ free_ri (struct RecordInfo *ri)
2367 */ 2367 */
2368static void 2368static void
2369zone_iteration_proc (void *cls, 2369zone_iteration_proc (void *cls,
2370 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, 2370 const struct GNUNET_IDENTITY_PrivateKey *zone_key,
2371 const char *name, 2371 const char *name,
2372 unsigned int rd_count, 2372 unsigned int rd_count,
2373 const struct GNUNET_GNSRECORD_Data *rd) 2373 const struct GNUNET_GNSRECORD_Data *rd)
@@ -2391,7 +2391,7 @@ zone_iteration_proc (void *cls,
2391 2391
2392 (void) cls; 2392 (void) cls;
2393 if (0 != 2393 if (0 !=
2394 memcmp (zone_key, pkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) 2394 memcmp (zone_key, pkey, sizeof (struct GNUNET_IDENTITY_PrivateKey)))
2395 { 2395 {
2396 GNUNET_break (0); 2396 GNUNET_break (0);
2397 return; 2397 return;
@@ -2608,9 +2608,9 @@ load_zone (const char *name, struct GNUNET_IDENTITY_Ego *ego)
2608 if (NULL == name) 2608 if (NULL == name)
2609 return; /* empty zone */ 2609 return; /* empty zone */
2610 current_pseudonym = GNUNET_strdup (name); 2610 current_pseudonym = GNUNET_strdup (name);
2611 pkey = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); 2611 pkey = GNUNET_new (struct GNUNET_IDENTITY_PrivateKey);
2612 *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); 2612 *pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
2613 GNUNET_CRYPTO_ecdsa_key_get_public (pkey, &pubkey); 2613 GNUNET_IDENTITY_ego_get_public_key (pkey, &pubkey);
2614 label = g_markup_printf_escaped ("<b>%s</b>", GNUNET_GNSRECORD_z2s (&pubkey)); 2614 label = g_markup_printf_escaped ("<b>%s</b>", GNUNET_GNSRECORD_z2s (&pubkey));
2615 gtk_label_set_markup (GTK_LABEL ( 2615 gtk_label_set_markup (GTK_LABEL (
2616 get_object ("gnunet_namestore_gtk_zone_label")), 2616 get_object ("gnunet_namestore_gtk_zone_label")),
@@ -2707,7 +2707,7 @@ fresh_label (const char *label)
2707 */ 2707 */
2708static void 2708static void
2709iop_create_cont (void *cls, 2709iop_create_cont (void *cls,
2710 const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv, 2710 const struct GNUNET_IDENTITY_PrivateKey *priv,
2711 const char *emsg) 2711 const char *emsg)
2712{ 2712{
2713 GtkEntry *entry; 2713 GtkEntry *entry;
@@ -3126,7 +3126,12 @@ gnunet_namestore_gtk_zone_add_button_clicked_cb (GtkButton *button,
3126 label = gtk_entry_get_text (entry); 3126 label = gtk_entry_get_text (entry);
3127 gtk_label_set_markup (status_label, _ ("Creating zone")); 3127 gtk_label_set_markup (status_label, _ ("Creating zone"));
3128 gtk_widget_set_sensitive (main_window, FALSE); 3128 gtk_widget_set_sensitive (main_window, FALSE);
3129 iop = GNUNET_IDENTITY_create (identity, label, NULL, &iop_create_cont, NULL); 3129 iop = GNUNET_IDENTITY_create (identity,
3130 label,
3131 NULL,
3132 GNUNET_IDENTITY_TYPE_ECDSA,
3133 &iop_create_cont,
3134 NULL);
3130 gtk_entry_set_text (entry, ""); 3135 gtk_entry_set_text (entry, "");
3131} 3136}
3132 3137