1 files changed, 25 insertions, 12 deletions

diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 107952bc..a2f537cd 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -98,8 +98,7 @@ struct EditPublicationState
 {
   int do_index;
   char *short_fn;
-  guint anonymity_level;
-  guint priority;
+  struct GNUNET_FS_BlockOptions bo;
   struct GNUNET_FS_FileInformation *fip;
   gint preview_changed;
   gboolean allow_no_keywords;
@@ -827,7 +826,7 @@ GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
   }
 
   state->cb (state->cls, state->do_index, state->short_fn,
-             state->anonymity_level, state->priority, NULL,
+             &state->bo, NULL,
              GTK_RESPONSE_CANCEL);
   g_free (state);
   g_object_set_data (pubwindow, PUBSTATE, NULL);
@@ -843,7 +842,7 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
   GObject *pubwindow;
   struct EditPublicationState *state;
   struct FileInformationUpdateContext ctx;
-
+  gint year;
   builder = GTK_BUILDER (user_data);
 
   pubwindow =
@@ -866,21 +865,30 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
   state->short_fn = ctx.short_fn;
   if (!GNUNET_GTK_get_selected_anonymity_level
       (builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
-       &state->anonymity_level))
-    state->priority =
+       &state->bo.anonymity_level))
+    state->bo.content_priority =
         gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                    (gtk_builder_get_object
                                     (builder,
                                      "GNUNET_GTK_edit_publication_priority_spin_button")));
+  state->bo.replication_level =
+    gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                               (gtk_builder_get_object
+                                (builder,
+                                 "GNUNET_GTK_edit_publication_replication_spin_button")));
+
   state->do_index =
       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
                                     (gtk_builder_get_object
                                      (builder,
                                       "GNUNET_GTK_edit_publication_index_checkbutton")));
-
-
+  year = gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                                    (gtk_builder_get_object
+                                     (builder,
+                                      "GNUNET_GTK_edit_publication_expiration_year_spin_button")));
+  state->bo.expiration_time = GNUNET_FS_year_to_time (year);
   state->cb (state->cls, state->do_index, state->short_fn,
-             state->anonymity_level, state->priority, ctx.root,
+             &state->bo, ctx.root,
              GTK_RESPONSE_OK);
   GNUNET_free_non_null (state->short_fn);
   GNUNET_free (state);
@@ -888,6 +896,7 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
   gtk_widget_hide (GTK_WIDGET (pubwindow));
 }
 
+
 gboolean
 GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
                                                     GdkEvent * event,
@@ -991,6 +1000,11 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
                               (builder,
                                "GNUNET_GTK_edit_publication_priority_spin_button")),
                              bo->content_priority);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON
+                             (gtk_builder_get_object
+                              (builder,
+                               "GNUNET_GTK_edit_publication_replication_spin_button")),
+                             bo->replication_level);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
                                 (gtk_builder_get_object
                                  (builder,
@@ -1007,7 +1021,7 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
 void
 GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
                                    int do_index, const char *short_fn,
-                                   uint32_t anonymity_level, uint32_t priority,
+                                   const struct GNUNET_FS_BlockOptions *bo,
                                    struct GNUNET_FS_FileInformation *fip,
                                    gboolean allow_no_keywords,
                                    GNUNET_FS_GTK_EditPublishDialogCallback cb,
@@ -1080,8 +1094,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
   state->do_index = do_index;
   if (NULL != short_fn)
     state->short_fn = GNUNET_strdup (short_fn);
-  state->anonymity_level = (guint) anonymity_level;
-  state->priority = (guint) priority;
+  state->bo = *bo;
   state->fip = fip;
   state->preview_changed = GNUNET_NO;
   state->allow_no_keywords = allow_no_keywords;