diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-08 18:14:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-08 18:14:31 +0000 |
commit | 55d292c2881c9dd5ef9e91140b52f41518acd2e5 (patch) | |
tree | 40ebcb12ee46186d2030b4ef3ff0f407e8738ae6 | |
parent | f64cd8cace4e0b2d52173027652628c27fe5893a (diff) | |
download | gnunet-gtk-55d292c2881c9dd5ef9e91140b52f41518acd2e5.tar.gz gnunet-gtk-55d292c2881c9dd5ef9e91140b52f41518acd2e5.zip |
finishing identity advertisement dialog (#3023)
-rw-r--r-- | contrib/gnunet_identity_gtk_advertise_dialog.glade | 24 | ||||
-rw-r--r-- | src/identity/gnunet-identity-gtk_advertise.c | 9 |
2 files changed, 20 insertions, 13 deletions
diff --git a/contrib/gnunet_identity_gtk_advertise_dialog.glade b/contrib/gnunet_identity_gtk_advertise_dialog.glade index 00460283..8d9380ee 100644 --- a/contrib/gnunet_identity_gtk_advertise_dialog.glade +++ b/contrib/gnunet_identity_gtk_advertise_dialog.glade | |||
@@ -2,6 +2,17 @@ | |||
2 | <interface> | 2 | <interface> |
3 | <requires lib="gtk+" version="2.20"/> | 3 | <requires lib="gtk+" version="2.20"/> |
4 | <!-- interface-naming-policy project-wide --> | 4 | <!-- interface-naming-policy project-wide --> |
5 | <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore"> | ||
6 | <columns> | ||
7 | <!-- column-name Keyword --> | ||
8 | <column type="gchararray"/> | ||
9 | </columns> | ||
10 | </object> | ||
11 | <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_vadj"> | ||
12 | <property name="upper">100</property> | ||
13 | <property name="step_increment">1</property> | ||
14 | <property name="page_increment">10</property> | ||
15 | </object> | ||
5 | <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog"> | 16 | <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog"> |
6 | <property name="can_focus">False</property> | 17 | <property name="can_focus">False</property> |
7 | <property name="border_width">5</property> | 18 | <property name="border_width">5</property> |
@@ -555,17 +566,6 @@ | |||
555 | <property name="step_increment">1</property> | 566 | <property name="step_increment">1</property> |
556 | <property name="page_increment">10</property> | 567 | <property name="page_increment">10</property> |
557 | </object> | 568 | </object> |
558 | <object class="GtkListStore" id="GNUNET_GTK_identity_advertise_keywords_liststore"> | ||
559 | <columns> | ||
560 | <!-- column-name Keyword --> | ||
561 | <column type="gchararray"/> | ||
562 | </columns> | ||
563 | </object> | ||
564 | <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_keywords_vadj"> | ||
565 | <property name="upper">100</property> | ||
566 | <property name="step_increment">1</property> | ||
567 | <property name="page_increment">10</property> | ||
568 | </object> | ||
569 | <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj"> | 569 | <object class="GtkAdjustment" id="GNUNET_GTK_identity_advertise_metadata_hadj"> |
570 | <property name="upper">100</property> | 570 | <property name="upper">100</property> |
571 | <property name="step_increment">1</property> | 571 | <property name="step_increment">1</property> |
@@ -593,11 +593,13 @@ | |||
593 | </object> | 593 | </object> |
594 | <object class="GtkAdjustment" id="priority_adjustment"> | 594 | <object class="GtkAdjustment" id="priority_adjustment"> |
595 | <property name="upper">100000000</property> | 595 | <property name="upper">100000000</property> |
596 | <property name="value">1000</property> | ||
596 | <property name="step_increment">1</property> | 597 | <property name="step_increment">1</property> |
597 | <property name="page_increment">10</property> | 598 | <property name="page_increment">10</property> |
598 | </object> | 599 | </object> |
599 | <object class="GtkAdjustment" id="replication_adjustment"> | 600 | <object class="GtkAdjustment" id="replication_adjustment"> |
600 | <property name="upper">99999</property> | 601 | <property name="upper">99999</property> |
602 | <property name="value">5</property> | ||
601 | <property name="step_increment">1</property> | 603 | <property name="step_increment">1</property> |
602 | <property name="page_increment">10</property> | 604 | <property name="page_increment">10</property> |
603 | </object> | 605 | </object> |
diff --git a/src/identity/gnunet-identity-gtk_advertise.c b/src/identity/gnunet-identity-gtk_advertise.c index 5bc08aef..1a17c0e9 100644 --- a/src/identity/gnunet-identity-gtk_advertise.c +++ b/src/identity/gnunet-identity-gtk_advertise.c | |||
@@ -288,6 +288,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
288 | struct GNUNET_CRYPTO_EccPublicKey pk; | 288 | struct GNUNET_CRYPTO_EccPublicKey pk; |
289 | struct PublishContext *pc; | 289 | struct PublishContext *pc; |
290 | guint anonymity; | 290 | guint anonymity; |
291 | const char *id; | ||
291 | 292 | ||
292 | if (GTK_RESPONSE_OK != response_id) | 293 | if (GTK_RESPONSE_OK != response_id) |
293 | goto cleanup; | 294 | goto cleanup; |
@@ -357,8 +358,12 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
357 | "GNUNET_GTK_identity_advertise_replication_spin_button"))); | 358 | "GNUNET_GTK_identity_advertise_replication_spin_button"))); |
358 | GNUNET_CRYPTO_ecc_key_get_public (&ac->priv, | 359 | GNUNET_CRYPTO_ecc_key_get_public (&ac->priv, |
359 | &pk); | 360 | &pk); |
360 | uri = GNUNET_FS_uri_sks_create (&pk, | 361 | id = gtk_entry_get_text |
361 | "root"); /* FIXME: allow user to specify! */ | 362 | (GTK_ENTRY |
363 | (gtk_builder_get_object | ||
364 | (ac->builder, | ||
365 | "GNUNET_GTK_identity_advertise_root_entry"))); | ||
366 | uri = GNUNET_FS_uri_sks_create (&pk, id); | ||
362 | 367 | ||
363 | pc = GNUNET_new (struct PublishContext); | 368 | pc = GNUNET_new (struct PublishContext); |
364 | pc->fs = GNUNET_FS_start (GIG_get_configuration (), | 369 | pc->fs = GNUNET_FS_start (GIG_get_configuration (), |