1 files changed, 115 insertions, 105 deletions

diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 37fe1a2a..05761a87 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -30,21 +30,22 @@
 
 #define PUBSTATE "edit-publication-state"
 
-struct edit_publication_state
+struct EditPublicationState
 {
-  int *do_index;
-  char **short_fn;
-  guint *anonymity_level;
-  guint *priority;
+  int do_index;
+  char *short_fn;
+  guint anonymity_level;
+  guint priority;
   struct GNUNET_FS_FileInformation *fip;
   gint preview_changed;
   gboolean allow_no_keywords;
   gboolean is_directory;
-  GNUNET_FS_GTK_edit_publish_dialog_cb cb;
+  GNUNET_FS_GTK_EditPublishDialogCallback cb;
   gchar *root;
   gpointer cls;
 };
 
+
 static void
 metadata_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
 {
@@ -67,6 +68,7 @@ metadata_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
                             gtk_tree_selection_get_selected (sel, NULL, NULL));
 }
 
+
 static void
 keywords_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
 {
@@ -100,7 +102,7 @@ keywords_selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
 
 void
 GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget,
-    gpointer user_data)
+                                               gpointer user_data)
 {
   GtkBuilder *builder;
   GtkListStore *metatypes_list;
@@ -135,9 +137,10 @@ GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget,
         3, EXTRACTOR_metatype_to_description (type), -1);
 }
 
+
 void
 GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton *button,
-    gpointer user_data)
+                                                   gpointer user_data)
 {
   GtkBuilder *builder;
   GtkTreeView *meta_tree;
@@ -155,9 +158,10 @@ GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton *button,
       2, _("Select a type"), 3, _("Specify a value"), 4, NULL, -1);
 }
 
+
 gboolean
 GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *widget,
-    GdkEventKey *event, gpointer user_data)
+                                                              GdkEventKey *event, gpointer user_data)
 {
   GtkBuilder *builder;
   GtkButton *add_button;
@@ -173,10 +177,11 @@ GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb (GtkWidget *widget,
   return FALSE;
 }
 
+
 void
-GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (
-    GtkCellRendererText *renderer, gchar *path, gchar *new_text,
-    gpointer user_data)
+GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellRendererText *renderer, 
+                                                                        gchar *path, gchar *new_text,
+                                                                        gpointer user_data)
 {
   GtkBuilder *builder;
   GtkTreeView *meta_tree;
@@ -212,6 +217,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (
   g_free (description);
 }
 
+
 void
 GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (
     GtkCellRendererCombo *combo, gchar *path_string, GtkTreeIter *new_iter,
@@ -227,6 +233,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (
   g_object_set_data (G_OBJECT (combo), "selected-type", pass_data);
 }
 
+
 void
 GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (
     GtkCellRendererText *renderer, gchar *path, gchar *new_text,
@@ -243,7 +250,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (
   char *pos;
 
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
 
   builder = GTK_BUILDER (user_data);
   meta_tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
@@ -296,9 +303,10 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (
   GNUNET_free_non_null (avalue);
 }
 
+
 void
 GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton *button,
-    gpointer user_data)
+                                                      gpointer user_data)
 {
   GtkTreeView *tv;
   GtkTreeSelection *sel;
@@ -319,9 +327,10 @@ GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton *button,
     gtk_tree_selection_select_iter (sel, &iter);
 }
 
+
 void
 GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
+                                                                GtkButton *button, gpointer user_data)
 {
   const char *keyword;
   GtkEntry *entry;
@@ -348,15 +357,26 @@ GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (
   gtk_entry_set_text (entry, "");
 }
 
-gboolean
-gtk_tree_model_get_item_count_cb (GtkTreeModel *model, GtkTreePath *path,
+
+static gboolean
+gtk_tree_model_has_items_cb (GtkTreeModel *model, GtkTreePath *path,
     GtkTreeIter *iter, gpointer data)
 {
-  gint *counter = (gint *) data;
-  *counter += 1;
-  return FALSE;
+  gboolean *val = (gboolean *) data;
+  *val = TRUE;
+  return TRUE;
 }
 
+
+static gboolean
+gtk_tree_model_has_items (GtkTreeModel *model)
+{
+  gboolean b = FALSE;
+  gtk_tree_model_foreach (model, &gtk_tree_model_has_items_cb, &b);
+  return b;
+}
+
+
 void
 GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable *editable,
     gpointer user_data)
@@ -380,31 +400,6 @@ GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable *editable,
 }
 
 
-gint
-gtk_tree_model_get_item_count (GtkTreeModel *model)
-{
-  gint c = 0;
-  gtk_tree_model_foreach (model, &gtk_tree_model_get_item_count_cb, &c);
-  return c;
-}
-
-gboolean
-gtk_tree_model_has_items_cb (GtkTreeModel *model, GtkTreePath *path,
-    GtkTreeIter *iter, gpointer data)
-{
-  gboolean *val = (gboolean *) data;
-  *val = TRUE;
-  return TRUE;
-}
-
-gboolean
-gtk_tree_model_has_items (GtkTreeModel *model)
-{
-  gboolean b = FALSE;
-  gtk_tree_model_foreach (model, &gtk_tree_model_has_items_cb, &b);
-  return b;
-}
-
 void
 GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -416,7 +411,7 @@ GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (
   GtkBuilder *builder;
   GtkWidget *ok;
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
   builder = GTK_BUILDER (user_data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -448,6 +443,7 @@ GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (
     gtk_widget_set_sensitive (ok, FALSE);
 }
 
+
 void
 GNUNET_GTK_edit_publication_keyword_list_normalize_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -494,6 +490,7 @@ GNUNET_GTK_edit_publication_keyword_list_normalize_button_clicked_cb (
   g_free (value);
 }
 
+
 void
 GNUNET_GTK_edit_publication_normalization_checkbox_toggled_cb (
     GtkToggleButton *button, gpointer user_data)
@@ -507,6 +504,7 @@ GNUNET_GTK_edit_publication_normalization_checkbox_toggled_cb (
       !gtk_toggle_button_get_active (norm_button));
 }
 
+
 void
 GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (
     GtkFileChooserButton *widget, gpointer user_data)
@@ -515,7 +513,7 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (
   GtkImage *image;
   GObject *pubwindow;
   GtkBuilder *builder = GTK_BUILDER (user_data);
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
 
   pubwindow = gtk_builder_get_object (builder,
       "GNUNET_GTK_edit_publication_window");
@@ -535,19 +533,22 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (
   state->preview_changed = GNUNET_YES;
 }
 
-struct fiu_context
+
+struct FileInformationUpdateContext
 {
   GtkBuilder *builder;
-  char **short_fn;
+  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.
  *
- * @param cls closure, new meta data container
+ * @param cls closure, a 'struct FileInformationUpdateContext'
  * @param plugin_name name of the plugin that produced this value;
  *        special values can be used (i.e. '<zlib>' for zlib being
  *        used in the main libextractor library and yielding
@@ -567,7 +568,7 @@ preserve_meta_items (void *cls, const char *plugin_name,
                      const char *data_mime_type, const char *data,
                      size_t data_len)
 {
-  struct fiu_context *context = (struct fiu_context *) cls;
+  struct FileInformationUpdateContext *context = cls;
   GtkBuilder *builder = context->builder;
   struct GNUNET_CONTAINER_MetaData *md = context->md;
   GtkTreeModel *tm;
@@ -578,7 +579,7 @@ preserve_meta_items (void *cls, const char *plugin_name,
   int keep;
 
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
 
   pubwindow = gtk_builder_get_object (builder,
       "GNUNET_GTK_edit_publication_window");
@@ -636,7 +637,7 @@ preserve_meta_items (void *cls, const char *plugin_name,
 /**
  * Function called to update the information in FI.
  *
- * @param cls closure (short_fn to update)
+ * @param cls closure with a 'struct FileInformationUpdateContext *'
  * @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)
@@ -654,8 +655,8 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
                          struct GNUNET_FS_BlockOptions *bo, int *do_index,
                          void **client_info)
 {
-  struct fiu_context *context = (struct fiu_context *) cls;
-  char **short_fn = context->short_fn;
+  struct FileInformationUpdateContext *context = cls;
+  char **short_fn = &context->short_fn;
   GtkBuilder *builder = context->builder;
   struct GNUNET_CONTAINER_MetaData *nm;
   GtkTreeModel *tm;
@@ -673,9 +674,8 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   GFile *f;
   GFileInfo *finfo;
   gboolean auto_normalize = FALSE;
-
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
 
   pubwindow = gtk_builder_get_object (builder,
       "GNUNET_GTK_edit_publication_window");
@@ -708,13 +708,15 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
                          "GNUNET_GTK_edit_publication_expiration_year_spin_button"));
   bo->expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
 
-  g_free (context->root);
-  context->root =
+  if (! context->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"))));
-
+                                    (gtk_builder_get_object
+                                     (builder,
+                                      "GNUNET_GTK_edit_publication_root_entry"))));
+  }
   /* update URI */
   if (NULL != (*uri))
     GNUNET_FS_uri_destroy (*uri);
@@ -819,13 +821,14 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   return GNUNET_SYSERR;         /* only visit top-level item */
 }
 
+
 void
 GNUNET_GTK_edit_publication_cancel_button_clicked_cb (
     GtkButton *button, gpointer user_data)
 {
   GtkBuilder *builder;
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
+  struct EditPublicationState *state = NULL;
 
   builder = GTK_BUILDER (user_data);
 
@@ -839,20 +842,20 @@ GNUNET_GTK_edit_publication_cancel_button_clicked_cb (
   }
 
   state->cb (state->cls, state->do_index, state->short_fn,
-      state->anonymity_level, state->priority, NULL, state->fip, GTK_RESPONSE_CANCEL);
+             state->anonymity_level, state->priority, NULL, GTK_RESPONSE_CANCEL);
   g_free (state);
   g_object_set_data (pubwindow, PUBSTATE, NULL);
   gtk_widget_hide (GTK_WIDGET (pubwindow));
 }
 
+
 void
-GNUNET_GTK_edit_publication_confirm_button_clicked_cb (
-    GtkButton *button, gpointer user_data)
+GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
   GtkBuilder *builder;
   GObject *pubwindow;
-  struct edit_publication_state *state = NULL;
-  struct fiu_context ctx;
+  struct EditPublicationState *state;
+  struct FileInformationUpdateContext ctx;
 
   builder = GTK_BUILDER (user_data);
 
@@ -869,30 +872,37 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (
   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);
   if (!GNUNET_GTK_get_selected_anonymity_level (builder,
-      "GNUNET_GTK_edit_publication_anonymity_combobox", state->anonymity_level))
-  *state->priority =
+                                                "GNUNET_GTK_edit_publication_anonymity_combobox", 
+                                                &state->anonymity_level))
+    state->priority =
       gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                  (gtk_builder_get_object
                                   (builder,
                                    "GNUNET_GTK_edit_publication_priority_spin_button")));
-  *state->do_index =
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
-                                    (gtk_builder_get_object
-                                     (builder,
-                                      "GNUNET_GTK_edit_publication_index_checkbutton")));
-
-
-  state->cb (state->cls, state->do_index, state->short_fn,
-      state->anonymity_level, state->priority, ctx.root, state->fip,
-      GTK_RESPONSE_OK);
-  g_free (state);
+  state->do_index =
+    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+                                  (gtk_builder_get_object
+                                   (builder,
+                                    "GNUNET_GTK_edit_publication_index_checkbutton")));
+
+
+  state->cb (state->cls, 
+             state->do_index,
+             state->short_fn,
+             state->anonymity_level, 
+             state->priority, ctx.root, 
+             GTK_RESPONSE_OK);
+  GNUNET_free (state->short_fn);
+  GNUNET_free (state);
   g_object_set_data (pubwindow, PUBSTATE, NULL);
   gtk_widget_hide (GTK_WIDGET (pubwindow));
 }
 
+
 /**
  * Add each of the keywords to the keyword list store.
  *
@@ -912,6 +922,7 @@ add_keyword (void *cls, const char *keyword, int is_mandatory)
   return GNUNET_OK;
 }
 
+
 /**
  * Function called to extract the information from FI.
  *
@@ -973,7 +984,7 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
                                "GNUNET_GTK_edit_publication_expiration_year_spin_button")),
                              year);
   GNUNET_GTK_select_anonymity_level (builder,
-      "GNUNET_GTK_edit_publication_anonymity_combobox", bo->anonymity_level);
+                                     "GNUNET_GTK_edit_publication_anonymity_combobox", bo->anonymity_level);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON
                              (gtk_builder_get_object
                               (builder,
@@ -992,16 +1003,21 @@ file_information_extract (void *cls, struct GNUNET_FS_FileInformation *fi,
  * Open the dialog to edit file information data.
  */
 void
-GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder, GtkWindow *parent, int *do_index,
-    char **short_fn, guint *anonymity_level, guint *priority,
-    struct GNUNET_FS_FileInformation *fip, gboolean allow_no_keywords,
-    GNUNET_FS_GTK_edit_publish_dialog_cb cb, gpointer cls)
+GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder, 
+                                   GtkWindow *parent, 
+                                   int do_index,
+                                   const char *short_fn, 
+                                   uint32_t anonymity_level, 
+                                   uint32_t priority,
+                                   struct GNUNET_FS_FileInformation *fip,
+                                   gboolean allow_no_keywords,
+                                   GNUNET_FS_GTK_EditPublishDialogCallback cb, gpointer cls)
 {
   GtkWidget *dialog;
   GObject *pubwindow;
   GtkEntry *entry;
   GtkWidget *ok;
-  struct edit_publication_state *state;
+  struct EditPublicationState *state;
 
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
   if (GNUNET_FS_file_information_is_directory (fip))
@@ -1019,9 +1035,9 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder, GtkWindow *parent, int *
   if (allow_no_keywords)
   {
     gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-        "GNUNET_GTK_edit_publication_root_entry")));
+                                                         "GNUNET_GTK_edit_publication_root_entry")));
     gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder,
-        "GNUNET_GTK_edit_publication_root_label")));
+                                                         "GNUNET_GTK_edit_publication_root_label")));
   }
   gtk_list_store_clear (GTK_LIST_STORE (gtk_builder_get_object (
       builder, "GNUNET_GTK_publication_keywords_liststore")));
@@ -1029,18 +1045,15 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder, GtkWindow *parent, int *
       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_window_set_title (GTK_WINDOW (dialog), *short_fn);
+                                               "GNUNET_GTK_edit_publication_window"));
+  gtk_window_set_title (GTK_WINDOW (dialog), short_fn);
 
-  state = g_new0 (struct edit_publication_state, 1);
+  state = GNUNET_malloc (sizeof (struct EditPublicationState));
   state->do_index = do_index;
-  state->short_fn = short_fn;
-  state->root = NULL;
-  state->anonymity_level = anonymity_level;
-  state->priority = priority;
+  state->short_fn = GNUNET_strdup (short_fn);
+  state->anonymity_level = (guint) anonymity_level;
+  state->priority = (guint) priority;
   state->fip = fip;
   state->preview_changed = GNUNET_NO;
   state->allow_no_keywords = allow_no_keywords;
@@ -1052,18 +1065,15 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder, GtkWindow *parent, int *
       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");
+                                      "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"));
+                                           "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));
 }
 
+
 /* end of gnunet-fs-gtk-edit_publish_dialog.c */