1 files changed, 66 insertions, 61 deletions

diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 62ed17fd..61832925 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -163,12 +163,6 @@ struct EditPublicationDialogContext
   struct GNUNET_FS_FileInformation *fip;
 
   /**
-   * Overall options for the publish operation.  This is also what
-   * we are primarily editing.
-   */
-  struct GNUNET_FS_BlockOptions bo;
-
-  /**
    * Flag to track if we changed the preview and thus should keep/discard
    * certain metadata. (FIXME: yucky!)
    */
@@ -642,12 +636,46 @@ GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *
 }
 
 
+
 /* ****************** handlers for closing the dialog ******************** */
 
 
+/**
+ * The user clicked the 'cancel' button.  Abort the operation.
+ *
+ * @param button the cancel button
+ * @param user_data the 'struct EditPublicationDialogContext'
+ */
+void
+GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
+                                                      gpointer user_data)
+{
+  struct EditPublicationDialogContext *ctx = user_data;
 
+  ctx->cb (ctx->cb_cls, GNUNET_SYSERR, NULL, NULL, NULL, GTK_RESPONSE_CANCEL);
+  free_edit_dialog_context (ctx);
+}
 
 
+/**
+ * The user closed the window.  Abort the operation.
+ *
+ * @param widget the window
+ * @param event the event that caused the window to close
+ * @param user_data the 'struct EditPublicationDialogContext'
+ * @return TRUE (always)
+ */
+gboolean
+GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
+                                                    GdkEvent * event,
+                                                    gpointer user_data)
+{
+  struct EditPublicationDialogContext *ctx = user_data;
+
+  ctx->cb (ctx->cb_cls, GNUNET_SYSERR, NULL, NULL, NULL, GTK_RESPONSE_CANCEL);
+  free_edit_dialog_context (ctx);
+  return TRUE;
+}
 
 
 /**
@@ -759,13 +787,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   GFileInfo *finfo;
   char *sfn;
 
-  if (!GNUNET_GTK_get_selected_anonymity_combo_level
-      (ctx->anonymity_combo, &ctx->bo.anonymity_level))
-    return GNUNET_SYSERR;
-  ctx->bo.content_priority = gtk_spin_button_get_value (ctx->priority_spin);
-  ctx->bo.replication_level = gtk_spin_button_get_value (ctx->replication_spin);
   *do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
-  ctx->bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (ctx->expiration_year_spin);
 
   /* update URI */
   if (NULL != (*uri))
@@ -792,7 +814,9 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
 
   /* update meta */
   ctx->md = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, ctx);
+  GNUNET_CONTAINER_meta_data_iterate (meta, 
+                                      &preserve_meta_items, 
+                                      ctx);
 
   GNUNET_CONTAINER_meta_data_clear (meta);
   if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->meta_liststore), &iter))
@@ -854,57 +878,41 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
 }
 
 
-void
-GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
-                                                      struct EditPublicationDialogContext *ctx)
-{
-  int do_index;
-
-  /* FIXME: why are we passing half of these values here? */
-  do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
-  ctx->cb (ctx->cb_cls, do_index, ctx->short_fn,
-           &ctx->bo, NULL, GTK_RESPONSE_CANCEL);
-  free_edit_dialog_context (ctx);
-}
-
-
-
+/**
+ * The user clicked the 'confirm' button.  Push the edits back into the
+ * FileInformation structure and given it and the options back to the 
+ * callback.  Then clean up the dialog.
+ *
+ * @param button the cancel button
+ * @param user_data the 'struct EditPublicationDialogContext'
+ */
 void
 GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
-                                                       struct EditPublicationDialogContext *ctx)
+                                                       gpointer user_data)
 {
+  struct EditPublicationDialogContext *ctx = user_data;
+  struct GNUNET_FS_BlockOptions bo;
   gint year;
-  const char *root;
-  int do_index;
 
-  GNUNET_FS_file_information_inspect (ctx->fip, &file_information_update, ctx);
-  if (!GNUNET_GTK_get_selected_anonymity_combo_level (ctx->anonymity_combo,
-      &ctx->bo.anonymity_level))
-    ctx->bo.content_priority = gtk_spin_button_get_value (ctx->priority_spin);
-  ctx->bo.replication_level = gtk_spin_button_get_value (ctx->replication_spin);
-
-  do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
+  GNUNET_FS_file_information_inspect (ctx->fip, 
+                                      &file_information_update,
+                                      ctx);
+  GNUNET_break (GNUNET_GTK_get_selected_anonymity_combo_level (ctx->anonymity_combo,
+                                                               &bo.anonymity_level));
+  bo.content_priority = gtk_spin_button_get_value (ctx->priority_spin);
+  bo.replication_level = gtk_spin_button_get_value (ctx->replication_spin);
   year = gtk_spin_button_get_value (ctx->expiration_year_spin);
-  ctx->bo.expiration_time = GNUNET_FS_year_to_time (year);
-  root = gtk_entry_get_text (ctx->root_entry);
-  ctx->cb (ctx->cb_cls, do_index, ctx->short_fn,
-      &ctx->bo, root, GTK_RESPONSE_OK);
+  bo.expiration_time = GNUNET_FS_year_to_time (year);
+  ctx->cb (ctx->cb_cls, 
+           gtk_toggle_button_get_active (ctx->index_checkbutton),
+           ctx->short_fn,
+           &bo,
+           gtk_entry_get_text (ctx->root_entry),
+           GTK_RESPONSE_OK);
   free_edit_dialog_context (ctx);
 }
 
 
-gboolean
-GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
-                                                    GdkEvent * event,
-                                                    struct EditPublicationDialogContext *ctx)
-{
-  GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GTK_BUTTON (gtk_builder_get_object
-                                                                    (ctx->builder, "GNUNET_GTK_edit_publication_cancel_button")),
-                                                        ctx);
-  return TRUE;
-}
-
-
 /* ****************** code for initialization of the dialog ******************** */
 
 
@@ -967,12 +975,12 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
       gtk_image_set_from_pixbuf (ctx->preview_image, pixbuf);
     }
   }
-  year = (int) GNUNET_FS_time_to_year (ctx->bo.expiration_time);
+  year = (int) GNUNET_FS_time_to_year (bo->expiration_time);
   gtk_spin_button_set_value (ctx->expiration_year_spin, year);
   GNUNET_GTK_select_anonymity_combo_level (ctx->anonymity_combo,
-      ctx->bo.anonymity_level);
-  gtk_spin_button_set_value (ctx->priority_spin, ctx->bo.content_priority);
-  gtk_spin_button_set_value (ctx->replication_spin, ctx->bo.replication_level);
+                                           bo->anonymity_level);
+  gtk_spin_button_set_value (ctx->priority_spin, bo->content_priority);
+  gtk_spin_button_set_value (ctx->replication_spin, bo->replication_level);
   gtk_toggle_button_set_active (ctx->index_checkbutton, *do_index);
   return GNUNET_SYSERR;         /* only visit top-level item */
 }
@@ -1001,9 +1009,7 @@ GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget, struct EditPub
  */
 void
 GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
-                                   int do_index /* FIXME: not needed? */, 
                                    const char *short_fn,
-                                   const struct GNUNET_FS_BlockOptions bo,
                                    struct GNUNET_FS_FileInformation *fip,
                                    gboolean allow_no_keywords,
                                    GtkListStore *anon_liststore,
@@ -1117,7 +1123,6 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
 
   if (NULL != short_fn)
     ctx->short_fn = GNUNET_strdup (short_fn);
-  ctx->bo = bo;
   ctx->fip = fip;
   ctx->preview_changed = GNUNET_NO;
   ctx->allow_no_keywords = allow_no_keywords;