1 files changed, 244 insertions, 123 deletions

diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index d787bff8..f125788b 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -29,66 +29,179 @@
 
 #include "metatypes.c"
 
+
+/**
+ * Internal state kept for each "edit" dialog where the user can edit
+ * publishing information for a file.
+ */
 struct EditPublicationDialogContext
 {
+  /**
+   * Builder for the dialog.
+   */
   GtkBuilder *builder;
 
-  GtkListStore *metatypes_liststore;
+  /**
+   * The 'window' object for the dialog.
+   */
+  GtkWindow *edit_publication_window;
 
-  GtkListStore *meta_liststore;
+  /**
+   * The confirmation button which closes the dialog (only sensitive
+   * if the values entered are valid).
+   */
+  GtkWidget *confirm_button;
+
+  /**
+   * Tree view showing the meta data for the file.
+   */
   GtkTreeView *meta_treeview;
-  GtkTreeSelection *meta_selection;
-  GtkButton *meta_add_button;
-  GtkWidget *meta_del_button;
 
-  GtkCellRendererCombo *meta_combo;
+  /**
+   * Tree view showing the keywords for the file.
+   */
+  GtkTreeView *keywords_treeview;
+
+  /**
+   * Image showing the preview image for the file.
+   */
+  GtkImage *preview_image;
+
+  /**
+   * Combo box where the user can select the anonymity level.
+   */
+  GtkComboBox *anonymity_combo;
+
+  /**
+   * Liststore of the 'anonymity_combo' with the anonymity levels.
+   */
+  GtkListStore *anonymity_liststore;
 
+  /**
+   * Liststore of possible publication types.
+   */
   GtkListStore *pubtypes_liststore;
-  GtkComboBox *pubtypes_combo;
 
+  /**
+   * Liststore of all possible meta types the user can choose from.
+   * (updated to based on the selected publication type).
+   */
+  GtkListStore *metatypes_liststore;
+
+  /**
+   * Liststore showing the meta data of the file (associated with
+   * the 'meta_treeview'.
+   */
+  GtkListStore *meta_liststore;
+
+  /**
+   * Liststore with the keywords of the file (associated with the
+   * 'keywords_treeview'.
+   */
   GtkListStore *keywords_liststore;
-  GtkTreeView *keywords_treeview;
-  GtkTreeSelection *keywords_selection;
-  GtkWidget *keyword_add_button;
-  GtkWidget *keyword_del_button;
 
-  GtkEntry *keyword_entry;
+  /**
+   * Spin button to select content priority level for the file.
+   */
+  GtkSpinButton *priority_spin;
 
-  GObject *pubwindow;
+  /**
+   * Spin button to select the expiration year.
+   */
+  GtkSpinButton *expiration_year_spin;
 
-  GtkWidget *ok;
-  GtkButton *cancel;
+  /**
+   * Spin button to select the replication level.
+   */
+  GtkSpinButton *replication_spin;
 
-  GtkImage *image;
+  /**
+   * Entry line for adding additional keywords.
+   */
+  GtkEntry *keyword_entry;
 
-  GtkToggleButton *index_checkbutton;
-  GtkLabel *index_label;
+  /**
+   * Entry line for setting a namespace root (possibly invisible).
+   */
   GtkEntry *root_entry;
-  GtkLabel *root_label;
 
-  GtkSpinButton *priority_spin;
-  GtkSpinButton *year_spin;
-  GtkSpinButton *replication_spin;
+  /**
+   * Entry line to check indexing vs. inserting (possibly invisible)
+   */
+  GtkToggleButton *index_checkbutton;
 
-  GtkComboBox *anonymity_combo;
-  GtkListStore *anonymity_liststore;
+  /**
+   * ???
+   */
+  GtkTreeIter *meta_combo_selected_iter;
 
-  int do_index;
-  char *short_fn;
-  struct GNUNET_FS_BlockOptions bo;
-  struct GNUNET_FS_FileInformation *fip;
-  gint preview_changed;
-  gboolean allow_no_keywords;
-  gboolean is_directory;
+  /**
+   * Continuation to call once the dialog has been closed
+   */
   GNUNET_FS_GTK_EditPublishDialogCallback cb;
-  gchar *root;
-  gpointer cls;
 
+  /**
+   * Closure for 'cb'.
+   */
+  void *cb_cls;
+
+  /**
+   * Short name of the file being published (or NULL).
+   */
+  char *short_fn;
+
+  /**
+   * Briefly used temporary meta data set.
+   */
   struct GNUNET_CONTAINER_MetaData *md;
 
-  GtkTreeIter *meta_combo_selected_iter;
+  /**
+   * Information about the file being published as seen by the FS-API.
+   * This is what we are primarily editing.
+   */
+  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!)
+   */
+  int preview_changed;
+
+  /**
+   * Is this operation for a directory?
+   */
+  int is_directory;
+
+  /**
+   * Is it allowed for the user to supply keywords in this dialog?
+   * FIXME: why 'gboolean'?
+   */
+  gboolean allow_no_keywords;
+
 };
 
+
+/**
+ * Free resources associated with the edit publication dialog.
+ *
+ * @param ctx the context of the dialog to release resources of
+ */
+static void
+free_edit_dialog_context (struct EditPublicationDialogContext *ctx)
+{
+  gtk_widget_destroy (GTK_WIDGET (ctx->edit_publication_window));
+  GNUNET_free_non_null (ctx->short_fn);
+  // FIXME: destroy builder!
+  GNUNET_free (ctx);
+}
+
+
 static void
 change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
 {
@@ -129,11 +242,9 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
   GtkTreeIter iter;
   gint code;
 
-  if (!gtk_combo_box_get_active_iter (widget, &iter))
+  if (! gtk_combo_box_get_active_iter (widget, &iter))
     return;
-
   gtk_tree_model_get (GTK_TREE_MODEL (ctx->pubtypes_liststore), &iter, 0, &code, -1);
-
   change_metatypes (ctx, code);
 }
 
@@ -141,7 +252,8 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
 static void
 metadata_selection_changed_cb (GtkTreeSelection *ts, struct EditPublicationDialogContext *ctx)
 {
-  gtk_widget_set_sensitive (ctx->meta_del_button,
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object
+                                        (ctx->builder, "GNUNET_GTK_edit_publication_delete_button")),
                             gtk_tree_selection_get_selected (ts, NULL, NULL));
 }
 
@@ -149,7 +261,9 @@ metadata_selection_changed_cb (GtkTreeSelection *ts, struct EditPublicationDialo
 static void
 keywords_selection_changed_cb (GtkTreeSelection *ts, struct EditPublicationDialogContext *ctx)
 {
-  gtk_widget_set_sensitive (ctx->keyword_del_button,
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object
+                                        (ctx->builder,
+                                         "GNUNET_GTK_edit_publication_keyword_list_del_button")),
                             gtk_tree_selection_get_selected (ts, NULL, NULL));
 }
 
@@ -176,7 +290,10 @@ GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *
 {
   if (event->keyval == GDK_KEY_Return)
   {
-    GNUNET_GTK_edit_publication_add_button_clicked_cb (GTK_BUTTON (ctx->keyword_add_button), ctx);
+    GNUNET_GTK_edit_publication_add_button_clicked_cb (GTK_BUTTON (gtk_builder_get_object (ctx->builder,
+                                                                                           "GNUNET_GTK_edit_publication_keyword_list_add_button")),
+                                                       
+                                                       ctx);
     return TRUE;
   }
   return FALSE;
@@ -198,7 +315,10 @@ void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb
 
   if (!ctx->meta_combo_selected_iter)
     return;
-  g_object_get (ctx->meta_combo, "model", &combo_model, NULL);
+  g_object_get (GTK_CELL_RENDERER_COMBO (gtk_builder_get_object
+                                         (ctx->builder,
+                                          "GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer")),
+                "model", &combo_model, NULL);
   gtk_tree_model_get (combo_model, ctx->meta_combo_selected_iter, 0, &type_id, 2, &description, -1);
   g_object_unref (combo_model);
   g_free (ctx->meta_combo_selected_iter);
@@ -277,14 +397,16 @@ GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton * button,
                                                       struct EditPublicationDialogContext *ctx)
 {
   GtkTreeIter iter;
+  GtkTreeSelection *meta_selection;
 
-  if (TRUE != gtk_tree_selection_get_selected (ctx->meta_selection, NULL, &iter))
+  meta_selection = gtk_tree_view_get_selection (ctx->meta_treeview);
+  if (! gtk_tree_selection_get_selected (meta_selection, NULL, &iter))
   {
     GNUNET_break (0);
     return;
   }
   if (gtk_list_store_remove (ctx->meta_liststore, &iter))
-    gtk_tree_selection_select_iter (ctx->meta_selection, &iter);
+    gtk_tree_selection_select_iter (meta_selection, &iter);
 }
 
 
@@ -301,7 +423,7 @@ GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (GtkButton *
   {
     gtk_list_store_insert_with_values (ctx->keywords_liststore, &iter, G_MAXINT, 0, keyword, 1, TRUE,
                                        -1);
-    gtk_widget_set_sensitive (ctx->ok, TRUE);
+    gtk_widget_set_sensitive (ctx->confirm_button, TRUE);
   }
   gtk_entry_set_text (ctx->keyword_entry, "");
 }
@@ -335,7 +457,9 @@ GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable * editable,
   const char *keyword;
 
   keyword = gtk_entry_get_text (ctx->keyword_entry);
-  gtk_widget_set_sensitive (ctx->keyword_add_button, (strlen (keyword) > 0) ? TRUE : FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (ctx->builder,
+                                                                                           "GNUNET_GTK_edit_publication_keyword_list_add_button")), 
+                            (strlen (keyword) > 0) ? TRUE : FALSE);
 }
 
 
@@ -345,17 +469,20 @@ GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (GtkButton *
                                                                 struct EditPublicationDialogContext *ctx)
 {
   GtkTreeIter iter;
+  GtkTreeSelection *keywords_selection;
+
+  keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
 
-  if (TRUE != gtk_tree_selection_get_selected (ctx->keywords_selection, NULL, &iter))
+  if (TRUE != gtk_tree_selection_get_selected (keywords_selection, NULL, &iter))
   {
     GNUNET_break (0);
     return;
   }
   if (gtk_list_store_remove (GTK_LIST_STORE (ctx->keywords_liststore), &iter))
-    gtk_tree_selection_select_iter (ctx->keywords_selection, &iter);
+    gtk_tree_selection_select_iter (keywords_selection, &iter);
 
   if (!ctx->allow_no_keywords && !gtk_tree_model_has_items (GTK_TREE_MODEL (ctx->keywords_liststore)))
-    gtk_widget_set_sensitive (ctx->ok, FALSE);
+    gtk_widget_set_sensitive (ctx->confirm_button, FALSE);
 }
 
 
@@ -365,7 +492,7 @@ void GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_c
   gchar *fn;
 
   fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-  gtk_image_set_from_file (ctx->image, fn);
+  gtk_image_set_from_file (ctx->preview_image, fn);
   g_free (fn);
   ctx->preview_changed = GNUNET_YES;
 }
@@ -478,6 +605,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   const char *mime;
   GFile *f;
   GFileInfo *finfo;
+  char *sfn;
 
   if (!GNUNET_GTK_get_selected_anonymity_combo_level
       (ctx->anonymity_combo, &ctx->bo.anonymity_level))
@@ -485,13 +613,8 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   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->year_spin);
+  ctx->bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (ctx->expiration_year_spin);
 
-  if (!ctx->allow_no_keywords)
-  {
-    g_free (ctx->root);
-    ctx->root = g_strdup (gtk_entry_get_text (ctx->root_entry));
-  }
   /* update URI */
   if (NULL != (*uri))
     GNUNET_FS_uri_destroy (*uri);
@@ -564,13 +687,17 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
     g_free (fn);
   }
   GNUNET_CONTAINER_meta_data_destroy (ctx->md);
+  ctx->md = NULL;
 
   /* update short_fn */
-  GNUNET_free_non_null (ctx->short_fn);
-  ctx->short_fn =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-                                                     EXTRACTOR_METATYPE_FILENAME,
-                                                     -1);
+  sfn = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+                                                       EXTRACTOR_METATYPE_FILENAME,
+                                                       -1);
+  if (NULL != sfn)
+  {
+    GNUNET_free_non_null (ctx->short_fn);
+    ctx->short_fn = sfn;
+  }
   return GNUNET_SYSERR;         /* only visit top-level item */
 }
 
@@ -579,17 +706,24 @@ void
 GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
                                                       struct EditPublicationDialogContext *ctx)
 {
-  ctx->cb (ctx->cls, ctx->do_index, ctx->short_fn,
-      &ctx->bo, NULL, GTK_RESPONSE_CANCEL);
-  gtk_widget_destroy (GTK_WIDGET (ctx->pubwindow));
+  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);
 }
 
 
+
 void
 GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
                                                        struct EditPublicationDialogContext *ctx)
 {
   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,
@@ -597,13 +731,13 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
     ctx->bo.content_priority = gtk_spin_button_get_value (ctx->priority_spin);
   ctx->bo.replication_level = gtk_spin_button_get_value (ctx->replication_spin);
 
-  ctx->do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
-  year = gtk_spin_button_get_value (ctx->year_spin);
+  do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
+  year = gtk_spin_button_get_value (ctx->expiration_year_spin);
   ctx->bo.expiration_time = GNUNET_FS_year_to_time (year);
-  ctx->cb (ctx->cls, ctx->do_index, ctx->short_fn,
-      &ctx->bo, ctx->root, GTK_RESPONSE_OK);
-  GNUNET_free_non_null (ctx->short_fn);
-  gtk_widget_destroy (GTK_WIDGET (ctx->pubwindow));
+  root = gtk_entry_get_text (ctx->root_entry);
+  ctx->cb (ctx->cb_cls, do_index, ctx->short_fn,
+      &ctx->bo, root, GTK_RESPONSE_OK);
+  free_edit_dialog_context (ctx);
 }
 
 
@@ -612,7 +746,9 @@ GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
                                                     GdkEvent * event,
                                                     struct EditPublicationDialogContext *ctx)
 {
-  GNUNET_GTK_edit_publication_cancel_button_clicked_cb (ctx->cancel, 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;
 }
 
@@ -672,11 +808,11 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
     pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
     if (pixbuf != NULL)
     {
-      gtk_image_set_from_pixbuf (ctx->image, pixbuf);
+      gtk_image_set_from_pixbuf (ctx->preview_image, pixbuf);
     }
   }
   year = (int) GNUNET_FS_time_to_year (ctx->bo.expiration_time);
-  gtk_spin_button_set_value (ctx->year_spin, year);
+  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);
@@ -689,13 +825,17 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
 void
 GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget, struct EditPublicationDialogContext *ctx)
 {
-  ctx->keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
-  ctx->meta_selection = gtk_tree_view_get_selection (ctx->meta_treeview);
+  GtkTreeSelection *meta_selection;
+  GtkTreeSelection *keywords_selection;
+
+  /* FIXME: these can be set by (modern) versions of Glade */
+  keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
+  meta_selection = gtk_tree_view_get_selection (ctx->meta_treeview);
 
-  g_signal_connect (G_OBJECT (ctx->keywords_selection), "changed",
+  g_signal_connect (G_OBJECT (keywords_selection), "changed",
                     G_CALLBACK (keywords_selection_changed_cb), ctx);
 
-  g_signal_connect (G_OBJECT (ctx->meta_selection), "changed",
+  g_signal_connect (G_OBJECT (meta_selection), "changed",
                     G_CALLBACK (metadata_selection_changed_cb), ctx);
 }
 
@@ -705,17 +845,20 @@ GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget, struct EditPub
  */
 void
 GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
-                                   int do_index, const char *short_fn,
+                                   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,
                                    GNUNET_FS_GTK_EditPublishDialogCallback cb,
-                                   gpointer cls)
+                                   gpointer cb_cls)
 {
   GtkTreeIter iter;
   gint code;
-
+  GtkComboBox *pubtypes_combo;
+  GtkLabel *index_label;
+  GtkLabel *root_label;
   struct EditPublicationDialogContext *ctx;
 
   ctx = GNUNET_malloc (sizeof (struct EditPublicationDialogContext));
@@ -737,59 +880,31 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   ctx->meta_treeview = GTK_TREE_VIEW (gtk_builder_get_object
                       (ctx->builder,
                        "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  ctx->meta_del_button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (ctx->builder, "GNUNET_GTK_edit_publication_delete_button"));
   ctx->keywords_treeview = GTK_TREE_VIEW (gtk_builder_get_object
                       (ctx->builder,
                        "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
-  ctx->keyword_del_button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (ctx->builder,
-                   "GNUNET_GTK_edit_publication_keyword_list_del_button"));
-  ctx->meta_add_button =
-        GTK_BUTTON (gtk_builder_get_object
-                    (ctx->builder, "GNUNET_GTK_edit_publication_add_button"));
-  ctx->meta_combo =
-      GTK_CELL_RENDERER_COMBO (gtk_builder_get_object
-                               (ctx->builder,
-                                "GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer"));
-  ctx->pubwindow =
-      gtk_builder_get_object (ctx->builder, "GNUNET_GTK_edit_publication_window");
+  ctx->edit_publication_window =
+    GTK_WINDOW (gtk_builder_get_object (ctx->builder, "GNUNET_GTK_edit_publication_window"));
   ctx->keywords_liststore = GTK_LIST_STORE (gtk_builder_get_object
                        (ctx->builder, "GNUNET_GTK_publication_keywords_liststore"));
   ctx->keyword_entry =
       GTK_ENTRY (gtk_builder_get_object
                  (ctx->builder, "GNUNET_GTK_edit_publication_keyword_entry"));
-  ctx->ok = GTK_WIDGET (gtk_builder_get_object
+  ctx->confirm_button = GTK_WIDGET (gtk_builder_get_object
                      (ctx->builder, "GNUNET_GTK_edit_publication_confirm_button"));
-  ctx->keyword_add_button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (ctx->builder,
-                   "GNUNET_GTK_edit_publication_keyword_list_add_button"));
-  ctx->image =
+  ctx->preview_image =
       GTK_IMAGE (gtk_builder_get_object
                  (ctx->builder,
                   "GNUNET_GTK_edit_publication_metadata_preview_image"));
   ctx->meta_liststore = GTK_LIST_STORE (gtk_builder_get_object
                          (ctx->builder,
                           "GNUNET_GTK_publication_metadata_liststore"));
-  ctx->cancel =
-      GTK_BUTTON (gtk_builder_get_object
-                  (ctx->builder, "GNUNET_GTK_edit_publication_cancel_button"));
 
-  ctx->index_label = GTK_LABEL (gtk_builder_get_object
-                    (ctx->builder, "GNUNET_GTK_edit_publication_index_label"));
   ctx->root_entry = GTK_ENTRY (gtk_builder_get_object
                     (ctx->builder, "GNUNET_GTK_edit_publication_root_entry"));
-  ctx->root_label = GTK_LABEL (gtk_builder_get_object
-                    (ctx->builder, "GNUNET_GTK_edit_publication_root_label"));
 
-  ctx->pubtypes_combo =
-      GTK_COMBO_BOX (gtk_builder_get_object
-                     (ctx->builder, "GNUNET_GTK_edit_publication_type_combo"));
 
-  ctx->year_spin = GTK_SPIN_BUTTON
+  ctx->expiration_year_spin = GTK_SPIN_BUTTON
                              (gtk_builder_get_object
                               (ctx->builder,
                                "GNUNET_GTK_edit_publication_expiration_year_spin_button"));
@@ -814,30 +929,36 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   /* indexing does not apply to directories */
   gtk_widget_set_visible (GTK_WIDGET (ctx->index_checkbutton),
       !GNUNET_FS_file_information_is_directory (fip));
-  gtk_widget_set_visible (GTK_WIDGET (ctx->index_label),
+  index_label = GTK_LABEL (gtk_builder_get_object
+                    (ctx->builder, "GNUNET_GTK_edit_publication_index_label"));
+  gtk_widget_set_visible (GTK_WIDGET (index_label),
       !GNUNET_FS_file_information_is_directory (fip));
   gtk_widget_set_visible (GTK_WIDGET (ctx->root_entry),
       !allow_no_keywords);
-  gtk_widget_set_visible (GTK_WIDGET (ctx->root_label),
+  root_label = GTK_LABEL (gtk_builder_get_object
+                          (ctx->builder, "GNUNET_GTK_edit_publication_root_label"));
+  gtk_widget_set_visible (GTK_WIDGET (root_label),
       !allow_no_keywords);
 
   gtk_list_store_clear (ctx->keywords_liststore);
   gtk_list_store_clear (ctx->meta_liststore);
 
   if (NULL != short_fn)
-    gtk_window_set_title (GTK_WINDOW (ctx->pubwindow), short_fn);
+    gtk_window_set_title (ctx->edit_publication_window, short_fn);
   else                                                       
-    gtk_window_set_title (GTK_WINDOW (ctx->pubwindow), _("<unnamed>"));
+    gtk_window_set_title (ctx->edit_publication_window, _("<unnamed>"));
 
-  if (gtk_combo_box_get_active_iter (ctx->pubtypes_combo, &iter))
+  pubtypes_combo =
+      GTK_COMBO_BOX (gtk_builder_get_object
+                     (ctx->builder, "GNUNET_GTK_edit_publication_type_combo"));
+  if (gtk_combo_box_get_active_iter (pubtypes_combo, &iter))
   {
     gtk_tree_model_get (GTK_TREE_MODEL (ctx->pubtypes_liststore), &iter, 0, &code, -1);
     change_metatypes (ctx, 0);
   }
   else
-    gtk_combo_box_set_active (ctx->pubtypes_combo, 0);
+    gtk_combo_box_set_active (pubtypes_combo, 0);
 
-  ctx->do_index = do_index;
   if (NULL != short_fn)
     ctx->short_fn = GNUNET_strdup (short_fn);
   ctx->bo = bo;
@@ -846,14 +967,14 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   ctx->allow_no_keywords = allow_no_keywords;
   ctx->is_directory = GNUNET_FS_file_information_is_directory (fip);
   ctx->cb = cb;
-  ctx->cls = cls;
+  ctx->cb_cls = cb_cls;
 
   GNUNET_FS_file_information_inspect (fip, &file_information_extract, ctx);
 
   gtk_entry_set_text (ctx->keyword_entry, "");
-  gtk_widget_set_sensitive (ctx->ok, allow_no_keywords ? TRUE : FALSE);
-  gtk_window_set_transient_for (GTK_WINDOW (ctx->pubwindow), parent);
-  gtk_window_present (GTK_WINDOW (ctx->pubwindow));
+  gtk_widget_set_sensitive (ctx->confirm_button, allow_no_keywords ? TRUE : FALSE);
+  gtk_window_set_transient_for (ctx->edit_publication_window, parent);
+  gtk_window_present (ctx->edit_publication_window);
 }