1 files changed, 38 insertions, 14 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index e8b94fd8..1334ca64 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -263,7 +263,10 @@ add_file_at_iter (gpointer data, const char *filename,
     file_size_fancy = GNUNET_STRINGS_byte_size_fancy (file_size);
   gtk_tree_store_set (ts, &pos, 0, file_size_fancy, 1, (gboolean) do_index, 2,
                       short_fn, 3, (guint) bo->anonymity_level, 4,
-                      (guint) bo->content_priority, 5, fi, -1);
+                      (guint) bo->content_priority, 5, fi,
+                      6, (guint64) bo->expiration_time.abs_value,
+                      7, (guint) bo->replication_level,
+                      -1);
   GNUNET_free (file_size_fancy);
   update_selectivity (data);
 }
@@ -310,7 +313,10 @@ create_dir_at_iter (gpointer data, const char *name,
   GNUNET_CONTAINER_meta_data_destroy (meta);
   gtk_tree_store_set (ts, pos, 0, MARKER_DIR_FILE_SIZE, 1, (gboolean) GNUNET_NO,
                       2, name, 3, (guint) bo->anonymity_level, 4,
-                      (guint) bo->content_priority, 5, fi, -1);
+                      (guint) bo->content_priority, 5, fi,
+                      6, (guint64) bo->expiration_time.abs_value,
+                      7, (guint) bo->replication_level,
+                      -1);
   update_selectivity (data);
 }
 
@@ -586,7 +592,9 @@ add_entry_to_ts (GtkTreeStore * ts, GtkTreeIter * iter, const char *filename,
     short_fn = 1 + ss;
   gtk_tree_store_set (ts, iter, 0, file_size_fancy, 1, (gboolean) do_index, 2,
                       short_fn, 3, (guint) bo->anonymity_level, 4,
-                      (guint) bo->content_priority, 5, fi, -1);
+                      (guint) bo->content_priority, 5, fi, 
+                      6, (guint64) bo->expiration_time.abs_value,
+                      7, (guint) bo->replication_level, -1);
   GNUNET_free (file_size_fancy);
 }
 
@@ -842,6 +850,8 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old,
   gchar *short_fn;
   guint anonymity_level;
   guint priority;
+  guint replication_level;
+  guint64 expiration_time_abs;
   char *fsf;
   GtkTreePath *path;
   GtkTreeSelection *sel;
@@ -853,10 +863,13 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old,
 
   builder = GTK_BUILDER (data);
   gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
-                      &anonymity_level, 4, &priority, 5, &fip, -1);
+                      &anonymity_level, 4, &priority, 5, &fip, 
+                      6, &expiration_time_abs, 7, &replication_level, -1);
   gtk_tree_store_set (GTK_TREE_STORE (tm), newpos, 0, fsf, 1, do_index, 2,
                       short_fn, 3, (guint) anonymity_level, 4, (guint) priority,
-                      5, fip, -1);
+                      5, fip, 
+                      6, expiration_time_abs,
+                      7, replication_level, -1);
   sel = NULL;
   tv = NULL;
   if (dsel == GNUNET_YES)
@@ -1220,16 +1233,15 @@ struct EditPublishContext
  * @param cls closure
  * @param do_index index flag set?
  * @param short_fn short filename
- * @param anonymity_level anonymity degree chosen for publishing
- * @param priority replication setting (rename!)
+ * @param bo block options for publishing
  * @param root always NULL here
  * @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
  */
 static void
 master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
                                        const char *short_fn,
-                                       uint32_t anonymity_level,
-                                       uint32_t priority, const char *root,
+                                       const struct GNUNET_FS_BlockOptions *bo,
+                                       const char *root,
                                        gint ret)
 {
   struct EditPublishContext *cbargs = cls;
@@ -1237,8 +1249,11 @@ master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
   GNUNET_assert (NULL == root);
   if (ret == GTK_RESPONSE_OK)
     gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter, 1, do_index,
-                        2, short_fn, 3, (guint) anonymity_level, 4,
-                        (guint) priority, -1);
+                        2, short_fn, 3, (guint) bo->anonymity_level, 4,
+                        (guint) bo->content_priority, 
+                        6, (guint64) bo->expiration_time.abs_value,
+                        7, (guint) bo->replication_level,                       
+                        -1);
   GNUNET_free (cbargs);
 }
 
@@ -1258,6 +1273,9 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
   guint anonymity_level;
   guint priority;
   struct GNUNET_FS_FileInformation *fip;
+  guint64 abs_etime;
+  guint replication_level;
+  struct GNUNET_FS_BlockOptions bo;
 
   builder = GTK_BUILDER (data);
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1278,11 +1296,17 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
   }
 
   gtk_tree_model_get (tm, &cbargs->iter, 1, &do_index, 2, &short_fn, 3,
-                      &anonymity_level, 4, &priority, 5, &fip, -1);
+                      &anonymity_level, 4, &priority, 5, &fip, 
+                      6, &abs_etime,
+                      7, &replication_level,
+                      -1);
+  bo.anonymity_level = anonymity_level;
+  bo.content_priority = priority;
+  bo.expiration_time.abs_value = (uint64_t) abs_etime;
+  bo.replication_level = replication_level;
   /* FIXME: shouldn't this use a fresh builder? */
   GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, do_index,
-                                     short_fn, (uint32_t) anonymity_level,
-                                     (uint32_t) priority, fip, TRUE,
+                                     short_fn, &bo, fip, TRUE,
                                      &master_publish_edit_publish_dialog_cb,
                                      cbargs);
 }