1 files changed, 320 insertions, 582 deletions

diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 2c51c377..ea3cc6b5 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -27,26 +27,76 @@
 #include "gnunet-fs-gtk.h"
 #include <gnunet/gnunet_util_lib.h>
 
+#include "metatypes.c"
 
-#define PUBSTATE "edit-publication-state"
+struct EditPublicationDialogContext
+{
+  GtkBuilder *builder;
 
-#include "metatypes.c"
+  GtkListStore *metatypes_liststore;
+
+  GtkListStore *meta_liststore;
+  GtkTreeView *meta_treeview;
+  GtkTreeSelection *meta_selection;
+  GtkButton *meta_add_button;
+  GtkWidget *meta_del_button;
+
+  GtkCellRendererCombo *meta_combo;
+
+  GtkListStore *pubtypes_liststore;
+  GtkComboBox *pubtypes_combo;
+
+  GtkListStore *keywords_liststore;
+  GtkTreeView *keywords_treeview;
+  GtkTreeSelection *keywords_selection;
+  GtkWidget *keyword_add_button;
+  GtkWidget *keyword_del_button;
+
+  GtkEntry *keyword_entry;
+
+  GObject *pubwindow;
+
+  GtkWidget *ok;
+  GtkButton *cancel;
+
+  GtkImage *image;
+
+  GtkToggleButton *index_checkbutton;
+  GtkLabel *index_label;
+  GtkEntry *root_entry;
+  GtkLabel *root_label;
+
+  GtkSpinButton *priority_spin;
+  GtkSpinButton *year_spin;
+  GtkSpinButton *replication_spin;
+
+  GtkComboBox *anonymity_combo;
+  GtkListStore *anonymity_liststore;
+
+  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;
+  GNUNET_FS_GTK_EditPublishDialogCallback cb;
+  gchar *root;
+  gpointer cls;
 
+  struct GNUNET_CONTAINER_MetaData *md;
+
+  GtkTreeIter *meta_combo_selected_iter;
+};
 
 static void
-change_metatypes (GtkBuilder * builder, gint code)
+change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
 {
-  GtkListStore *metatypes_list;
   gint pub_type = 0, i;
   gint pubtype_count = 0;
   gint max_type;
   GtkTreeIter iter;
 
-  metatypes_list =
-      GTK_LIST_STORE (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_publication_metadata_types_liststore"));
-
   for (pub_type = 0; types[pub_type] != NULL; pub_type++)
     pubtype_count += 1;
 
@@ -55,12 +105,12 @@ change_metatypes (GtkBuilder * builder, gint code)
   else
     pub_type = 0;
 
-  gtk_list_store_clear (metatypes_list);
+  gtk_list_store_clear (ctx->metatypes_liststore);
   max_type = EXTRACTOR_metatype_get_max ();
   for (i = 0; types[pub_type][i] != EXTRACTOR_METATYPE_RESERVED; i++)
   {
     if (types[pub_type][i] < max_type && types[pub_type][i] > 0)
-      gtk_list_store_insert_with_values (metatypes_list, &iter, G_MAXINT, 0,
+      gtk_list_store_insert_with_values (ctx->metatypes_liststore, &iter, G_MAXINT, 0,
                                          types[pub_type][i], 1,
                                          EXTRACTOR_METAFORMAT_UTF8, 2,
                                          EXTRACTOR_metatype_to_string (types
@@ -74,133 +124,45 @@ change_metatypes (GtkBuilder * builder, gint code)
 
 void
 GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
-                                                   gpointer user_data)
+                                                   struct EditPublicationDialogContext *ctx)
 {
   GtkTreeIter iter;
-  GtkBuilder *builder;
-  GtkListStore *pubtypes_list;
   gint code;
 
   if (!gtk_combo_box_get_active_iter (widget, &iter))
     return;
-  builder = GTK_BUILDER (user_data);
-
-  pubtypes_list =
-      GTK_LIST_STORE (gtk_builder_get_object
-                      (builder, "GNUNET_GTK_publication_types_liststore"));
 
-  gtk_tree_model_get (GTK_TREE_MODEL (pubtypes_list), &iter, 0, &code, -1);
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->pubtypes_liststore), &iter, 0, &code, -1);
 
-  change_metatypes (builder, code);
+  change_metatypes (ctx, code);
 }
 
-struct EditPublicationState
-{
-  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;
-  GNUNET_FS_GTK_EditPublishDialogCallback cb;
-  gchar *root;
-  gpointer cls;
-};
-
 
 static void
-metadata_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
+metadata_selection_changed_cb (GtkTreeSelection *ts, struct EditPublicationDialogContext *ctx)
 {
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-  GtkWidget *button;
-  GtkBuilder *builder;
-
-  builder = GTK_BUILDER (user_data);
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "GNUNET_GTK_edit_publication_delete_button"));
-  gtk_widget_set_sensitive (button,
-                            gtk_tree_selection_get_selected (sel, NULL, NULL));
+  gtk_widget_set_sensitive (ctx->meta_del_button,
+                            gtk_tree_selection_get_selected (ts, NULL, NULL));
 }
 
 
 static void
-keywords_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
-{
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-  GtkWidget *button;
-  GtkBuilder *builder;
-
-  builder = GTK_BUILDER (user_data);
-
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_edit_publication_keyword_list_del_button"));
-
-  gtk_widget_set_sensitive (button,
-                            gtk_tree_selection_get_selected (sel, NULL, NULL));
-}
-
-
-void
-GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget * widget,
-                                               gpointer user_data)
+keywords_selection_changed_cb (GtkTreeSelection *ts, struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-
-  builder = GTK_BUILDER (user_data);
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  g_signal_connect (G_OBJECT (sel), "changed",
-                    G_CALLBACK (metadata_selection_changed_cb), builder);
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  g_signal_connect (G_OBJECT (sel), "changed",
-                    G_CALLBACK (keywords_selection_changed_cb), builder);
+  gtk_widget_set_sensitive (ctx->keyword_del_button,
+                            gtk_tree_selection_get_selected (ts, NULL, NULL));
 }
 
 
 void
 GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton * button,
-                                                   gpointer user_data)
+                                                   struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkTreeView *meta_tree;
-  GtkListStore *meta_list;
   GtkTreeIter iter;
 
-  builder = GTK_BUILDER (user_data);
-  meta_tree =
-      GTK_TREE_VIEW (gtk_builder_get_object
-                     (builder,
-                      "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
-
-  gtk_list_store_insert (meta_list, &iter, 0);
+  gtk_list_store_insert (ctx->meta_liststore, &iter, 0);
   /* type == 0 means "not set" */
-  gtk_list_store_set (meta_list, &iter, 0, 0, 1, EXTRACTOR_METAFORMAT_UTF8, 2,
+  gtk_list_store_set (ctx->meta_liststore, &iter, 0, 0, 1, EXTRACTOR_METAFORMAT_UTF8, 2,
                       _("Select a type"), 3, _("Specify a value"), 4, NULL, -1);
 }
 
@@ -210,20 +172,11 @@ GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *
                                                               widget,
                                                               GdkEventKey *
                                                               event,
-                                                              gpointer
-                                                              user_data)
+                                                              struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkButton *add_button;
-
-  builder = GTK_BUILDER (user_data);
-
   if (event->keyval == GDK_KEY_Return)
   {
-    add_button =
-        GTK_BUTTON (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_edit_publication_add_button"));
-    GNUNET_GTK_edit_publication_add_button_clicked_cb (add_button, user_data);
+    GNUNET_GTK_edit_publication_add_button_clicked_cb (GTK_BUTTON (ctx->keyword_add_button), ctx);
     return TRUE;
   }
   return FALSE;
@@ -232,43 +185,26 @@ GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *
 
 void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb
     (GtkCellRendererText * renderer, gchar * path, gchar * new_text,
-     gpointer user_data)
+     struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkTreeView *meta_tree;
-  GtkListStore *meta_list;
-  GtkCellRendererCombo *combo;
   GtkTreeModel *combo_model;
   GtkTreeIter iter;
   gint type_id;
   gchar *description = NULL;
-  GtkTreeIter *pass_data = NULL;
-
-  builder = GTK_BUILDER (user_data);
-  meta_tree =
-      GTK_TREE_VIEW (gtk_builder_get_object
-                     (builder,
-                      "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
+
   if (!gtk_tree_model_get_iter_from_string
-      (GTK_TREE_MODEL (meta_list), &iter, path))
+      (GTK_TREE_MODEL (ctx->meta_liststore), &iter, path))
     return;
 
-  combo =
-      GTK_CELL_RENDERER_COMBO (gtk_builder_get_object
-                               (builder,
-                                "GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer"));
-
-  pass_data = g_object_get_data (G_OBJECT (combo), "selected-type");
-  if (!pass_data)
+  if (!ctx->meta_combo_selected_iter)
     return;
-  g_object_get (combo, "model", &combo_model, NULL);
-  gtk_tree_model_get (combo_model, pass_data, 0, &type_id, 2, &description, -1);
+  g_object_get (ctx->meta_combo, "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 (pass_data);
-  g_object_set_data (G_OBJECT (combo), "selected-type", NULL);
+  g_free (ctx->meta_combo_selected_iter);
+  ctx->meta_combo_selected_iter = NULL;
 
-  gtk_list_store_set (meta_list, &iter, 0, type_id, 1,
+  gtk_list_store_set (ctx->meta_liststore, &iter, 0, type_id, 1,
                       EXTRACTOR_METAFORMAT_UTF8, 2, new_text, 4, description,
                       -1);
   g_free (description);
@@ -277,26 +213,19 @@ void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb
 
 void GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb
     (GtkCellRendererCombo * combo, gchar * path_string, GtkTreeIter * new_iter,
-     gpointer user_data)
+     struct EditPublicationDialogContext *ctx)
 {
-  GtkTreeIter *pass_data;
-
-  pass_data = g_object_get_data (G_OBJECT (combo), "selected-type");
-  if (pass_data)
-    g_free (pass_data);
-  pass_data = g_new0 (GtkTreeIter, 1);
-  *pass_data = *new_iter;
-  g_object_set_data (G_OBJECT (combo), "selected-type", pass_data);
+  if (ctx->meta_combo_selected_iter)
+    g_free (ctx->meta_combo_selected_iter);
+  ctx->meta_combo_selected_iter = g_new0 (GtkTreeIter, 1);
+  *ctx->meta_combo_selected_iter = *new_iter;
 }
 
 
 void GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb
     (GtkCellRendererText * renderer, gchar * path, gchar * new_text,
-     gpointer user_data)
+     struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkTreeView *meta_tree;
-  GtkListStore *meta_list;
   GtkTreeIter iter;
   gint metatype;
   char *avalue;
@@ -304,31 +233,13 @@ void GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb
   size_t slen;
   char *pos;
 
-  GObject *pubwindow;
-  struct EditPublicationState *state = NULL;
-
-  builder = GTK_BUILDER (user_data);
-  meta_tree =
-      GTK_TREE_VIEW (gtk_builder_get_object
-                     (builder,
-                      "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  meta_list = GTK_LIST_STORE (gtk_tree_view_get_model (meta_tree));
   if (!gtk_tree_model_get_iter_from_string
-      (GTK_TREE_MODEL (meta_list), &iter, path))
-    return;
-
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
+      (GTK_TREE_MODEL (ctx->meta_liststore), &iter, path))
     return;
-  }
 
-  gtk_tree_model_get (GTK_TREE_MODEL (meta_list), &iter, 0, &metatype, -1);
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter, 0, &metatype, -1);
   if (metatype == EXTRACTOR_METATYPE_FILENAME &&
-      new_text[strlen (new_text) - 1] != '/' && state->is_directory)
+      new_text[strlen (new_text) - 1] != '/' && ctx->is_directory)
   {
     GNUNET_asprintf (&avalue, "%s/", new_text);
     /* if user typed '\' instead of '/', change it! */
@@ -356,65 +267,43 @@ void GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb
     avalue = NULL;
   }
 
-  gtk_list_store_set (meta_list, &iter, 3, ivalue, -1);
+  gtk_list_store_set (ctx->meta_liststore, &iter, 3, ivalue, -1);
   GNUNET_free_non_null (avalue);
 }
 
 
 void
 GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton * button,
-                                                      gpointer user_data)
+                                                      struct EditPublicationDialogContext *ctx)
 {
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-  GtkTreeModel *tm;
   GtkTreeIter iter;
-  GtkBuilder *builder = GTK_BUILDER (user_data);
 
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_metadata_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+  if (TRUE != gtk_tree_selection_get_selected (ctx->meta_selection, NULL, &iter))
   {
     GNUNET_break (0);
     return;
   }
-  if (gtk_list_store_remove (GTK_LIST_STORE (tm), &iter))
-    gtk_tree_selection_select_iter (sel, &iter);
+  if (gtk_list_store_remove (ctx->meta_liststore, &iter))
+    gtk_tree_selection_select_iter (ctx->meta_selection, &iter);
 }
 
 
 void
 GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (GtkButton *
                                                                 button,
-                                                                gpointer
-                                                                user_data)
+                                                                struct EditPublicationDialogContext *ctx)
 {
   const char *keyword;
-  GtkEntry *entry;
-  GtkListStore *ls;
   GtkTreeIter iter;
-  GtkBuilder *builder;
-  GtkWidget *ok;
 
-  builder = GTK_BUILDER (user_data);
-
-  ls = GTK_LIST_STORE (gtk_builder_get_object
-                       (builder, "GNUNET_GTK_publication_keywords_liststore"));
-  entry =
-      GTK_ENTRY (gtk_builder_get_object
-                 (builder, "GNUNET_GTK_edit_publication_keyword_entry"));
-  keyword = gtk_entry_get_text (entry);
+  keyword = gtk_entry_get_text (ctx->keyword_entry);
   if (strlen (keyword) > 0)
   {
-    gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, keyword, 1, TRUE,
+    gtk_list_store_insert_with_values (ctx->keywords_liststore, &iter, G_MAXINT, 0, keyword, 1, TRUE,
                                        -1);
-    ok = GTK_WIDGET (gtk_builder_get_object
-                     (builder, "GNUNET_GTK_edit_publication_confirm_button"));
-    gtk_widget_set_sensitive (ok, TRUE);
+    gtk_widget_set_sensitive (ctx->ok, TRUE);
   }
-  gtk_entry_set_text (entry, "");
+  gtk_entry_set_text (ctx->keyword_entry, "");
 }
 
 
@@ -441,112 +330,47 @@ gtk_tree_model_has_items (GtkTreeModel * model)
 
 void
 GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable * editable,
-                                                      gpointer user_data)
+                                                      struct EditPublicationDialogContext *ctx)
 {
   const char *keyword;
-  GtkEntry *entry;
-  GtkWidget *button;
-  GtkBuilder *builder;
-
-  builder = GTK_BUILDER (user_data);
 
-  button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_edit_publication_keyword_list_add_button"));
-  entry =
-      GTK_ENTRY (gtk_builder_get_object
-                 (builder, "GNUNET_GTK_edit_publication_keyword_entry"));
-  keyword = gtk_entry_get_text (entry);
-  gtk_widget_set_sensitive (button, (strlen (keyword) > 0) ? TRUE : FALSE);
+  keyword = gtk_entry_get_text (ctx->keyword_entry);
+  gtk_widget_set_sensitive (ctx->keyword_add_button, (strlen (keyword) > 0) ? TRUE : FALSE);
 }
 
 
 void
 GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (GtkButton *
                                                                 button,
-                                                                gpointer
-                                                                user_data)
+                                                                struct EditPublicationDialogContext *ctx)
 {
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-  GtkTreeModel *tm;
   GtkTreeIter iter;
-  GtkBuilder *builder;
-  GtkWidget *ok;
-  GObject *pubwindow;
-  struct EditPublicationState *state = NULL;
-
-  builder = GTK_BUILDER (user_data);
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
 
-  sel = gtk_tree_view_get_selection (tv);
-  if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+  if (TRUE != gtk_tree_selection_get_selected (ctx->keywords_selection, NULL, &iter))
   {
     GNUNET_break (0);
     return;
   }
-  if (gtk_list_store_remove (GTK_LIST_STORE (tm), &iter))
-    gtk_tree_selection_select_iter (sel, &iter);
+  if (gtk_list_store_remove (GTK_LIST_STORE (ctx->keywords_liststore), &iter))
+    gtk_tree_selection_select_iter (ctx->keywords_selection, &iter);
 
-  ok = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_edit_publication_confirm_button"));
-
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
-    return;
-  }
-
-  if (!state->allow_no_keywords && !gtk_tree_model_has_items (tm))
-    gtk_widget_set_sensitive (ok, FALSE);
+  if (!ctx->allow_no_keywords && !gtk_tree_model_has_items (GTK_TREE_MODEL (ctx->keywords_liststore)))
+    gtk_widget_set_sensitive (ctx->ok, FALSE);
 }
 
 
-void GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (GtkFileChooserButton * widget, gpointer user_data)
+void GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (
+    GtkFileChooserButton * widget, struct EditPublicationDialogContext *ctx)
 {
   gchar *fn;
-  GtkImage *image;
-  GObject *pubwindow;
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-  struct EditPublicationState *state = NULL;
-
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
-    return;
-  }
 
   fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-  image =
-      GTK_IMAGE (gtk_builder_get_object
-                 (builder,
-                  "GNUNET_GTK_edit_publication_metadata_preview_image"));
-  gtk_image_set_from_file (image, fn);
+  gtk_image_set_from_file (ctx->image, fn);
   g_free (fn);
-  state->preview_changed = GNUNET_YES;
+  ctx->preview_changed = GNUNET_YES;
 }
 
 
-struct FileInformationUpdateContext
-{
-  GtkBuilder *builder;
-  char *short_fn;
-  gchar *root;
-  struct GNUNET_CONTAINER_MetaData *md;
-  gboolean allow_no_keywords;
-};
-
-
 /**
  * Copy binary meta data from to the new container and also
  * preserve all entries that were not changed.
@@ -571,58 +395,41 @@ preserve_meta_items (void *cls, const char *plugin_name,
                      const char *data_mime_type, const char *data,
                      size_t data_len)
 {
-  struct FileInformationUpdateContext *context = cls;
-  GtkBuilder *builder = context->builder;
-  struct GNUNET_CONTAINER_MetaData *md = context->md;
-  GtkTreeModel *tm;
+  struct EditPublicationDialogContext *ctx = cls;
   GtkTreeIter iter;
   gchar *value;
   guint ntype;
   guint nformat;
   int keep;
 
-  GObject *pubwindow;
-  struct EditPublicationState *state = NULL;
-
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
-    return 0;
-  }
   /* FIXME: make sure this is all correct UTF-8-wise */
   keep = GNUNET_NO;
   switch (format)
   {
   case EXTRACTOR_METAFORMAT_UTF8:
   case EXTRACTOR_METAFORMAT_C_STRING:
-    tm = GTK_TREE_MODEL (gtk_builder_get_object
-                         (builder,
-                          "GNUNET_GTK_publication_metadata_liststore"));
-    if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+    if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->meta_liststore), &iter))
     {
       do
       {
-        gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
+        gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
         if ((ntype == type) && (nformat == format) &&
             (0 == strcmp (value, data)))
         {
-          gtk_list_store_remove (GTK_LIST_STORE (tm), &iter);
+          gtk_list_store_remove (ctx->meta_liststore, &iter);
           keep = GNUNET_YES;
           g_free (value);
           break;
         }
         g_free (value);
       }
-      while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+      while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ctx->meta_liststore), &iter));
     }
     break;
   case EXTRACTOR_METAFORMAT_UNKNOWN:
     break;
   case EXTRACTOR_METAFORMAT_BINARY:
-    if (state->preview_changed == GNUNET_NO)
+    if (ctx->preview_changed == GNUNET_NO)
       keep = GNUNET_YES;
     break;
   default:
@@ -631,7 +438,7 @@ preserve_meta_items (void *cls, const char *plugin_name,
   }
   if (GNUNET_YES == keep)
     GNUNET_break (GNUNET_OK ==
-                  GNUNET_CONTAINER_meta_data_insert (md, plugin_name, type,
+                  GNUNET_CONTAINER_meta_data_insert (ctx->md, plugin_name, type,
                                                      format, data_mime_type,
                                                      data, data_len));
   return 0;
@@ -659,68 +466,32 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
                          struct GNUNET_FS_BlockOptions *bo, int *do_index,
                          void **client_info)
 {
-  struct FileInformationUpdateContext *context = cls;
-  char **short_fn = &context->short_fn;
-  GtkBuilder *builder = context->builder;
-  struct GNUNET_CONTAINER_MetaData *nm;
-  GtkTreeModel *tm;
+  struct EditPublicationDialogContext *ctx = cls;
   GtkTreeIter iter;
   struct GNUNET_FS_Uri *nxt;
   struct GNUNET_FS_Uri *mrg;
   gchar *value;
   guint ntype;
   guint nformat;
-  GtkSpinButton *sb;
   gchar *fn;
   char *data;
   gsize data_size;
   const char *mime;
   GFile *f;
   GFileInfo *finfo;
-  GObject *pubwindow;
-  struct EditPublicationState *state = NULL;
 
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
+  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->year_spin);
 
-  if (!GNUNET_GTK_get_selected_anonymity_level
-      (builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
-       &bo->anonymity_level))
-    return GNUNET_SYSERR;
-  bo->content_priority =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_edit_publication_priority_spin_button")));
-  bo->replication_level =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_edit_publication_replication_spin_button")));
-  *do_index =
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
-                                    (gtk_builder_get_object
-                                     (builder,
-                                      "GNUNET_GTK_edit_publication_index_checkbutton")));
-  sb = GTK_SPIN_BUTTON (gtk_builder_get_object
-                        (builder,
-                         "GNUNET_GTK_edit_publication_expiration_year_spin_button"));
-  bo->expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
-
-  if (!context->allow_no_keywords)
+  if (!ctx->allow_no_keywords)
   {
-    g_free (context->root);
-    context->root =
-        g_strdup (gtk_entry_get_text
-                  (GTK_ENTRY
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_edit_publication_root_entry"))));
+    g_free (ctx->root);
+    ctx->root = g_strdup (gtk_entry_get_text (ctx->root_entry));
   }
   /* update URI */
   if (NULL != (*uri))
@@ -729,13 +500,11 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   nxt = NULL;
   mrg = NULL;
 
-  tm = GTK_TREE_MODEL (gtk_builder_get_object
-                       (builder, "GNUNET_GTK_publication_keywords_liststore"));
-  if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->keywords_liststore), &iter))
   {
     do
     {
-      gtk_tree_model_get (tm, &iter, 0, &value, -1);
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->keywords_liststore), &iter, 0, &value, -1);
       nxt = GNUNET_FS_uri_ksk_create_from_args (1, (const char **) &value);
       mrg = GNUNET_FS_uri_ksk_merge (nxt, *uri);
       GNUNET_FS_uri_destroy (nxt);
@@ -744,36 +513,33 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
       *uri = mrg;
       g_free (value);
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+    while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ctx->keywords_liststore), &iter));
   }
 
   /* update meta */
-  nm = GNUNET_CONTAINER_meta_data_create ();
-  context->md = nm;
-  GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, context);
+  ctx->md = GNUNET_CONTAINER_meta_data_create ();
+  GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, ctx);
 
   GNUNET_CONTAINER_meta_data_clear (meta);
-  tm = GTK_TREE_MODEL (gtk_builder_get_object
-                       (builder, "GNUNET_GTK_publication_metadata_liststore"));
-  if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->meta_liststore), &iter))
   {
     do
     {
-      gtk_tree_model_get (tm, &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
+      gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter, 0, &ntype, 1, &nformat, 3, &value, -1);
       if (ntype > 0)
-        GNUNET_CONTAINER_meta_data_insert (nm, "<user>", ntype, nformat,
+        GNUNET_CONTAINER_meta_data_insert (ctx->md, "<user>", ntype, nformat,
                                            "text/plain", value,
                                            strlen (value) + 1);
       g_free (value);
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+    while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ctx->meta_liststore), &iter));
   }
-  GNUNET_CONTAINER_meta_data_merge (meta, nm);
-  if (state->preview_changed == GNUNET_YES)
+  GNUNET_CONTAINER_meta_data_merge (meta, ctx->md);
+  if (ctx->preview_changed == GNUNET_YES)
   {
     fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
                                         (gtk_builder_get_object
-                                         (builder,
+                                         (ctx->builder,
                                           "GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button")));
     f = g_file_new_for_path (fn);
     finfo =
@@ -798,11 +564,11 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
     g_object_unref (f);
     g_free (fn);
   }
-  GNUNET_CONTAINER_meta_data_destroy (nm);
+  GNUNET_CONTAINER_meta_data_destroy (ctx->md);
 
   /* update short_fn */
-  GNUNET_free_non_null (*short_fn);
-  *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);
@@ -813,110 +579,42 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
 
 void
 GNUNET_GTK_edit_publication_cancel_button_clicked_cb (GtkButton * button,
-                                                      gpointer user_data)
+                                                      struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GObject *pubwindow;
-  struct EditPublicationState *state = NULL;
-
-  builder = GTK_BUILDER (user_data);
-
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
-    return;
-  }
-
-  state->cb (state->cls, state->do_index, state->short_fn,
-             &state->bo, NULL,
-             GTK_RESPONSE_CANCEL);
-  g_free (state);
-  g_object_set_data (pubwindow, PUBSTATE, NULL);
-  gtk_widget_hide (GTK_WIDGET (pubwindow));
+  ctx->cb (ctx->cls, ctx->do_index, ctx->short_fn,
+      &ctx->bo, NULL, GTK_RESPONSE_CANCEL);
+  gtk_widget_destroy (GTK_WIDGET (ctx->pubwindow));
 }
 
 
 void
 GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
-                                                       gpointer user_data)
+                                                       struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GObject *pubwindow;
-  struct EditPublicationState *state;
-  struct FileInformationUpdateContext ctx;
   gint year;
-  builder = GTK_BUILDER (user_data);
 
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  state = g_object_get_data (pubwindow, PUBSTATE);
-  if (!state)
-  {
-    GNUNET_break (0);
-    return;
-  }
-
-  ctx.builder = builder;
-  ctx.short_fn = state->short_fn;
-  ctx.root = NULL;
-  ctx.md = NULL;
-  ctx.allow_no_keywords = state->allow_no_keywords;
-
-  GNUNET_FS_file_information_inspect (state->fip, &file_information_update,
-                                      &ctx);
-  state->short_fn = ctx.short_fn;
-  if (!GNUNET_GTK_get_selected_anonymity_level
-      (builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
-       &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->bo, ctx.root,
-             GTK_RESPONSE_OK);
-  GNUNET_free_non_null (state->short_fn);
-  GNUNET_free (state);
-  g_object_set_data (pubwindow, PUBSTATE, NULL);
-  gtk_widget_hide (GTK_WIDGET (pubwindow));
+  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);
+
+  ctx->do_index = gtk_toggle_button_get_active (ctx->index_checkbutton);
+  year = gtk_spin_button_get_value (ctx->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));
 }
 
 
 gboolean
 GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
                                                     GdkEvent * event,
-                                                    gpointer user_data)
+                                                    struct EditPublicationDialogContext *ctx)
 {
-  GtkBuilder *builder;
-  GtkButton *button;
-
-  builder = GTK_BUILDER (user_data);
-
-  button =
-      GTK_BUTTON (gtk_builder_get_object
-                  (builder, "GNUNET_GTK_edit_publication_cancel_button"));
-
-  GNUNET_GTK_edit_publication_cancel_button_clicked_cb (button, user_data);
+  GNUNET_GTK_edit_publication_cancel_button_clicked_cb (ctx->cancel, ctx);
   return TRUE;
 }
 
@@ -962,162 +660,202 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
                           struct GNUNET_FS_BlockOptions *bo, int *do_index,
                           void **client_info)
 {
-  GtkBuilder *builder = GTK_BUILDER (cls);
-  GtkImage *img;
+  struct EditPublicationDialogContext *ctx = cls;
   GdkPixbuf *pixbuf;
   int year;
-  GtkListStore *ls;
-
-  ls = GTK_LIST_STORE (gtk_builder_get_object
-                       (builder, "GNUNET_GTK_publication_keywords_liststore"));
 
   if (NULL != *uri)
-    GNUNET_FS_uri_ksk_get_keywords (*uri, &add_keyword, ls);
+    GNUNET_FS_uri_ksk_get_keywords (*uri, &add_keyword, ctx->keywords_liststore);
   if (NULL != meta)
   {
-    ls = GTK_LIST_STORE (gtk_builder_get_object
-                         (builder,
-                          "GNUNET_GTK_publication_metadata_liststore"));
     GNUNET_CONTAINER_meta_data_iterate (meta,
                                         &GNUNET_FS_GTK_add_meta_data_to_list_store,
-                                        ls);
+                                        ctx->meta_liststore);
     pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
     if (pixbuf != NULL)
     {
-      img =
-          GTK_IMAGE (gtk_builder_get_object
-                     (builder,
-                      "GNUNET_GTK_edit_publication_metadata_preview_image"));
-      gtk_image_set_from_pixbuf (img, pixbuf);
+      gtk_image_set_from_pixbuf (ctx->image, pixbuf);
     }
   }
-  year = (int) GNUNET_FS_time_to_year (bo->expiration_time);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON
-                             (gtk_builder_get_object
-                              (builder,
-                               "GNUNET_GTK_edit_publication_expiration_year_spin_button")),
-                             year);
-  GNUNET_GTK_select_anonymity_level (builder,
-                                     "GNUNET_GTK_edit_publication_anonymity_combobox",
-                                     bo->anonymity_level);
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON
-                             (gtk_builder_get_object
-                              (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,
-                                  "GNUNET_GTK_edit_publication_index_checkbutton")),
-                                *do_index);
+  year = (int) GNUNET_FS_time_to_year (ctx->bo.expiration_time);
+  gtk_spin_button_set_value (ctx->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);
+  gtk_toggle_button_set_active (ctx->index_checkbutton, *do_index);
   return GNUNET_SYSERR;         /* only visit top-level item */
 }
 
 
+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);
+
+  g_signal_connect (G_OBJECT (ctx->keywords_selection), "changed",
+                    G_CALLBACK (keywords_selection_changed_cb), ctx);
+
+  g_signal_connect (G_OBJECT (ctx->meta_selection), "changed",
+                    G_CALLBACK (metadata_selection_changed_cb), ctx);
+}
+
 /**
  * Open the dialog to edit file information data.
  * short_fn MUST be UTF-8-encoded
  */
 void
-GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
+GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
                                    int do_index, const char *short_fn,
-                                   const struct GNUNET_FS_BlockOptions *bo,
+                                   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)
 {
-  GtkWidget *dialog;
-  GObject *pubwindow;
-  GtkEntry *entry;
-  GtkWidget *ok;
-  struct EditPublicationState *state;
-  GtkListStore *pubtypes_list;
-  GtkComboBox *pubtypes_combo;
   GtkTreeIter iter;
   gint code;
 
-  GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
+  struct EditPublicationDialogContext *ctx;
+
+  ctx = GNUNET_malloc (sizeof (struct EditPublicationDialogContext));
+  ctx->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_edit_publication.glade", ctx);
+
+  if (ctx->builder == NULL)
+  {
+    GNUNET_free (ctx);
+    return;
+  }
+
+  ctx->pubtypes_liststore =
+      GTK_LIST_STORE (gtk_builder_get_object
+                      (ctx->builder, "GNUNET_GTK_publication_types_liststore"));
+  ctx->metatypes_liststore =
+      GTK_LIST_STORE (gtk_builder_get_object
+                      (ctx->builder,
+                       "GNUNET_GTK_publication_metadata_types_liststore"));
+  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->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->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 =
+      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
+                             (gtk_builder_get_object
+                              (ctx->builder,
+                               "GNUNET_GTK_edit_publication_expiration_year_spin_button"));
+  ctx->priority_spin = GTK_SPIN_BUTTON
+                             (gtk_builder_get_object
+                              (ctx->builder,
+                               "GNUNET_GTK_edit_publication_priority_spin_button"));
+  ctx->replication_spin = GTK_SPIN_BUTTON
+                             (gtk_builder_get_object
+                              (ctx->builder,
+                               "GNUNET_GTK_edit_publication_replication_spin_button"));
+  ctx->index_checkbutton = GTK_TOGGLE_BUTTON
+                                (gtk_builder_get_object
+                                 (ctx->builder,
+                                  "GNUNET_GTK_edit_publication_index_checkbutton"));
+  ctx->anonymity_combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->builder,
+      "GNUNET_GTK_edit_publication_anonymity_combobox"));
+  gtk_combo_box_set_model (ctx->anonymity_combo, GTK_TREE_MODEL (anon_liststore));
+  ctx->anonymity_liststore = anon_liststore;
+
+  GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->builder);
   /* indexing does not apply to directories */
-  gtk_widget_set_visible (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder,
-                     "GNUNET_GTK_edit_publication_index_checkbutton")),
+  gtk_widget_set_visible (GTK_WIDGET (ctx->index_checkbutton),
       !GNUNET_FS_file_information_is_directory (fip));
-  gtk_widget_set_visible (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_edit_publication_index_label")),
+  gtk_widget_set_visible (GTK_WIDGET (ctx->index_label),
       !GNUNET_FS_file_information_is_directory (fip));
-  gtk_widget_set_visible (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_edit_publication_root_entry")),
+  gtk_widget_set_visible (GTK_WIDGET (ctx->root_entry),
       !allow_no_keywords);
-  gtk_widget_set_visible (GTK_WIDGET
-                   (gtk_builder_get_object
-                    (builder, "GNUNET_GTK_edit_publication_root_label")),
+  gtk_widget_set_visible (GTK_WIDGET (ctx->root_label),
       !allow_no_keywords);
 
-  gtk_list_store_clear (GTK_LIST_STORE
-                        (gtk_builder_get_object
-                         (builder,
-                          "GNUNET_GTK_publication_keywords_liststore")));
-  gtk_list_store_clear (GTK_LIST_STORE
-                        (gtk_builder_get_object
-                         (builder,
-                          "GNUNET_GTK_publication_metadata_liststore")));
-
-  GNUNET_FS_file_information_inspect (fip, &file_information_extract, builder);
-  dialog =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "GNUNET_GTK_edit_publication_window"));
+  gtk_list_store_clear (ctx->keywords_liststore);
+  gtk_list_store_clear (ctx->meta_liststore);
+
   if (NULL != short_fn)
-    gtk_window_set_title (GTK_WINDOW (dialog), short_fn);
-  else
-    gtk_window_set_title (GTK_WINDOW (dialog), _("<unnamed>"));
-  pubtypes_list =
-      GTK_LIST_STORE (gtk_builder_get_object
-                      (builder, "GNUNET_GTK_publication_types_liststore"));
-  pubtypes_combo =
-      GTK_COMBO_BOX (gtk_builder_get_object
-                     (builder, "GNUNET_GTK_edit_publication_type_combo"));
+    gtk_window_set_title (GTK_WINDOW (ctx->pubwindow), short_fn);
+  else                                                       
+    gtk_window_set_title (GTK_WINDOW (ctx->pubwindow), _("<unnamed>"));
 
-  if (gtk_combo_box_get_active_iter (pubtypes_combo, &iter))
+  if (gtk_combo_box_get_active_iter (ctx->pubtypes_combo, &iter))
   {
-    gtk_tree_model_get (GTK_TREE_MODEL (pubtypes_list), &iter, 0, &code, -1);
-    change_metatypes (builder, 0);
+    gtk_tree_model_get (GTK_TREE_MODEL (ctx->pubtypes_liststore), &iter, 0, &code, -1);
+    change_metatypes (ctx, 0);
   }
   else
-    gtk_combo_box_set_active (pubtypes_combo, 0);
+    gtk_combo_box_set_active (ctx->pubtypes_combo, 0);
 
-  state = GNUNET_malloc (sizeof (struct EditPublicationState));
-  state->do_index = do_index;
+  ctx->do_index = do_index;
   if (NULL != short_fn)
-    state->short_fn = GNUNET_strdup (short_fn);
-  state->bo = *bo;
-  state->fip = fip;
-  state->preview_changed = GNUNET_NO;
-  state->allow_no_keywords = allow_no_keywords;
-  state->is_directory = GNUNET_FS_file_information_is_directory (fip);
-  state->cb = cb;
-  state->cls = cls;
-
-  entry =
-      GTK_ENTRY (gtk_builder_get_object
-                 (builder, "GNUNET_GTK_edit_publication_keyword_entry"));
-  gtk_entry_set_text (entry, "");
-  pubwindow =
-      gtk_builder_get_object (builder, "GNUNET_GTK_edit_publication_window");
-  g_object_set_data (pubwindow, PUBSTATE, state);
-  ok = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_edit_publication_confirm_button"));
-  gtk_widget_set_sensitive (ok, allow_no_keywords ? TRUE : FALSE);
-  gtk_window_set_transient_for (GTK_WINDOW (pubwindow), parent);
-  gtk_window_present (GTK_WINDOW (dialog));
+    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;
+  ctx->is_directory = GNUNET_FS_file_information_is_directory (fip);
+  ctx->cb = cb;
+  ctx->cls = 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));
 }