-more code clean up in edit dialog

1 files changed, 48 insertions, 27 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 29435940..57a5eb6a 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -1037,44 +1037,66 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
 
 struct EditPublishContext
 {
+  struct GNUNET_FS_FileInformation *fip;
+
   GtkTreeModel *tm;
+
   GtkTreeIter iter;
 };
 
 
 /**
+ * Update tree view based on the information from the
+ * GNUNET_FS_FileInformation publish-structure.
+ *
+ * @param cls closure, a 'struct EditPublishContext *'
+ * @param fi the entry in the publish-structure
+ * @param length length of the file or directory
+ * @param meta metadata for the file or directory (can be modified)
+ * @param uri pointer to the keywords that will be used for this entry (can be modified)
+ * @param bo block options (can be modified)
+ * @param do_index should we index (can be modified)
+ * @param client_info pointer to client context set upon creation (can be modified)
+ * @return GNUNET_OK to continue, GNUNET_NO to remove
+ *         this entry from the directory, GNUNET_SYSERR
+ *         to abort the iteration
+ */
+static int
+update_treeview_after_edit (void *cls, struct GNUNET_FS_FileInformation *fi,
+                            uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+                            struct GNUNET_FS_Uri **uri,
+                            struct GNUNET_FS_BlockOptions *bo, int *do_index,
+                            void **client_info)
+{
+  struct EditPublishContext *epc = cls;
+  
+  gtk_tree_store_set (GTK_TREE_STORE (epc->tm), &epc->iter, 
+                      1, *do_index,
+                      3, (guint) bo->anonymity_level, 
+                      4, (guint) bo->content_priority, 
+                      6, (guint64) bo->expiration_time.abs_value,
+                      7, (guint) bo->replication_level,                 
+                      -1); 
+  return GNUNET_SYSERR;
+}
+
+
+/**
  * Function called when the edit publish dialog has been closed.
  *
  * @param cls closure
- * @param do_index index flag set?
- * @param short_fn short filename
- * @param bo block options for publishing
- * @param root always NULL here
  * @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
+ * @param root unused (namespace root name)
  */
 static void
-master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
-                                       const char *short_fn,
-                                       const struct GNUNET_FS_BlockOptions *bo,
-                                       const char *root,
-                                       gint ret)
+master_publish_edit_publish_dialog_cb (gpointer cls,
+                                       gint ret,
+                                       const char *root)
 {
   struct EditPublishContext *cbargs = cls;
-  struct GNUNET_FS_FileInformation *fi;
 
   if (ret == GTK_RESPONSE_OK)
-  {
-    gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter, 
-                        1, do_index,
-                        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);
-    gtk_tree_model_get (cbargs->tm, &cbargs->iter, 5, &fi, -1);
-    GNUNET_FS_file_information_set_filename (fi, short_fn);
-  }
+    GNUNET_FS_file_information_inspect (cbargs->fip, &update_treeview_after_edit, cbargs);
   GNUNET_free (cbargs);
 }
 
@@ -1084,8 +1106,6 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
                                                          struct MainPublishingDialogContext *ctx)
 {
   struct EditPublishContext *cbargs;
-  char *short_fn;
-  struct GNUNET_FS_FileInformation *fip;
   GtkListStore *anon_liststore;
 
   anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (ctx->main_window_builder, 
@@ -1099,13 +1119,14 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
     return;
   }
   gtk_tree_model_get (ctx->file_info_treemodel, &cbargs->iter,
-                      2, &short_fn, 
-                      5, &fip, 
+                      5, &cbargs->fip, 
                       -1);
   /* FIXME: can we just give our anon_liststore out like this? What about
      (unintended) sharing of state? */
   GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog, 
-                                     short_fn, fip, TRUE, anon_liststore,
+                                     cbargs->fip, 
+                                     GNUNET_YES, 
+                                     anon_liststore,
                                      &master_publish_edit_publish_dialog_cb,
                                      cbargs);
 }