[GNUnet-SVN] r29118 - in gnunet-gtk: contrib src/identity

[gnunet]

Author: grothoff
Date: 2013-09-08 20:14:31 +0200 (Sun, 08 Sep 2013)
New Revision: 29118

Modified:
   gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
   gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
Log:
finishing identity advertisement dialog (#3023)

Modified: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-09-08 18:08:26 UTC (rev 29117)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade       
2013-09-08 18:14:31 UTC (rev 29118)
@@ -2,6 +2,17 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_keywords_liststore">
+    <columns>
+      <!-- column-name Keyword -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_keywords_vadj">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -555,17 +566,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" 
id="GNUNET_GTK_identity_advertise_keywords_liststore">
-    <columns>
-      <!-- column-name Keyword -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_keywords_vadj">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkAdjustment" 
id="GNUNET_GTK_identity_advertise_metadata_hadj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
@@ -593,11 +593,13 @@
   </object>
   <object class="GtkAdjustment" id="priority_adjustment">
     <property name="upper">100000000</property>
+    <property name="value">1000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="replication_adjustment">
     <property name="upper">99999</property>
+    <property name="value">5</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>

Modified: gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c
===================================================================
--- gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c     2013-09-08 
18:08:26 UTC (rev 29117)
+++ gnunet-gtk/src/identity/gnunet-identity-gtk_advertise.c     2013-09-08 
18:14:31 UTC (rev 29118)
@@ -288,6 +288,7 @@
   struct GNUNET_CRYPTO_EccPublicKey pk;
   struct PublishContext *pc;
   guint anonymity;
+  const char *id;
 
   if (GTK_RESPONSE_OK != response_id)
     goto cleanup;  
@@ -357,8 +358,12 @@
        "GNUNET_GTK_identity_advertise_replication_spin_button")));
   GNUNET_CRYPTO_ecc_key_get_public (&ac->priv,
                                    &pk);
-  uri = GNUNET_FS_uri_sks_create (&pk,
-                                 "root"); /* FIXME: allow user to specify! */
+  id = gtk_entry_get_text 
+    (GTK_ENTRY
+     (gtk_builder_get_object 
+      (ac->builder,
+       "GNUNET_GTK_identity_advertise_root_entry")));
+  uri = GNUNET_FS_uri_sks_create (&pk, id);
 
   pc = GNUNET_new (struct PublishContext);
   pc->fs = GNUNET_FS_start (GIG_get_configuration (),