1 files changed, 136 insertions, 132 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 443558a7..d214d5f4 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -79,7 +79,7 @@ update_selectivity (gpointer data)
   int ns_ok;
   gchar *namespace_id;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -97,32 +97,25 @@ update_selectivity (gpointer data)
   }
   up_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_up_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_up_button"));
   down_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_down_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_down_button"));
   left_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_left_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_left_button"));
   right_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_right_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_right_button"));
   delete_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_delete_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_delete_button"));
   edit_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_edit_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_edit_button"));
   execute_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (builder,
-                   "GNUNET_GTK_master_publish_dialog_execute_button"));
+                  (builder, "GNUNET_GTK_master_publish_dialog_execute_button"));
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
@@ -203,8 +196,9 @@ update_selectivity (gpointer data)
  * @param iter parent entry, or NULL for top-level addition
  */
 static void
-add_file_at_iter (gpointer data, const char *filename, const struct GNUNET_FS_BlockOptions *bo,
-                  int do_index, GtkTreeIter * iter)
+add_file_at_iter (gpointer data, const char *filename,
+                  const struct GNUNET_FS_BlockOptions *bo, int do_index,
+                  GtkTreeIter * iter)
 {
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeRowReference *row_reference;
@@ -220,7 +214,7 @@ add_file_at_iter (gpointer data, const char *filename, const struct GNUNET_FS_Bl
   const char *ss;
   struct stat sbuf;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   if (0 != STAT (filename, &sbuf))
@@ -287,8 +281,9 @@ add_file_at_iter (gpointer data, const char *filename, const struct GNUNET_FS_Bl
  * @param pos iterator to set to the location of the new element
  */
 static void
-create_dir_at_iter (gpointer data, const char *name, const struct GNUNET_FS_BlockOptions *bo,
-                    GtkTreeIter * iter, GtkTreeIter * pos)
+create_dir_at_iter (gpointer data, const char *name,
+                    const struct GNUNET_FS_BlockOptions *bo, GtkTreeIter * iter,
+                    GtkTreeIter * pos)
 {
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeRowReference *row_reference;
@@ -296,8 +291,8 @@ create_dir_at_iter (gpointer data, const char *name, const struct GNUNET_FS_Bloc
   struct GNUNET_CONTAINER_MetaData *meta;
   GtkTreeStore *ts;
   GtkBuilder *builder;
-  
-  
+
+
   builder = GTK_BUILDER (data);
 
   ts = GTK_TREE_STORE (gtk_builder_get_object
@@ -785,6 +780,7 @@ scan_directory (void *cls, const char *filename)
     {
       char *filename_utf8;
       const char *ss, *short_fn;
+
       GNUNET_assert (mcm == NULL);
       /* we're top-level */
       short_fn = filename;
@@ -793,8 +789,9 @@ scan_directory (void *cls, const char *filename)
       filename_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) short_fn);
       GNUNET_CONTAINER_meta_data_insert (pd->meta, "<gnunet-gtk>",
                                          EXTRACTOR_METATYPE_FILENAME,
-                                         EXTRACTOR_METAFORMAT_UTF8, "text/plain",
-                                         filename_utf8, strlen (filename_utf8) + 1);
+                                         EXTRACTOR_METAFORMAT_UTF8,
+                                         "text/plain", filename_utf8,
+                                         strlen (filename_utf8) + 1);
       GNUNET_free_non_null (filename_utf8);
       add_entry_to_ts (adc->ts, &pd->iter, filename, &adc->bo, adc->do_index,
                        NULL, pd->meta);
@@ -817,13 +814,13 @@ scan_directory (void *cls, const char *filename)
  * @param do_index should we index?
  */
 static void
-add_dir (gpointer data, const char *filename, const struct GNUNET_FS_BlockOptions *bo,
-         int do_index)
+add_dir (gpointer data, const char *filename,
+         const struct GNUNET_FS_BlockOptions *bo, int do_index)
 {
   struct stat sbuf;
   struct AddDirContext scan_ctx;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   if (0 != STAT (filename, &sbuf))
@@ -870,8 +867,8 @@ remove_old_entry (GtkTreeStore * ts, GtkTreeIter * root)
  * Move an entry in the tree.
  */
 static void
-move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
-            int dsel)
+move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old,
+            GtkTreeIter * newpos, int dsel)
 {
   struct GNUNET_FS_FileInformation *fip;
   GtkTreeView *tv;
@@ -887,7 +884,7 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * n
   GtkTreeRowReference *rr;
   GtkTreeRowReference *rr2;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
   gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
                       &anonymity_level, 4, &priority, 5, &fip, -1);
@@ -946,15 +943,14 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * n
  * User has changed the "current" identifier for the content in
  * the GtkTreeView.  Update the model.
  */
-void 
-GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb (GtkCellRendererText * renderer, 
-                                                                       gchar * cpath, gchar * new_text,
-                                                                       gpointer user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
+    (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+     gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (user_data);
   ts = GTK_TREE_STORE (gtk_builder_get_object
                        (builder, "GNUNET_GTK_pseudonym_tree_store"));
@@ -974,15 +970,14 @@ GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb (GtkCellRe
  * User has changed the "current" identifier for the content in
  * the GtkTreeView.  Update the model.
  */
-void 
-GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb (GtkCellRendererText * renderer, 
-                                                                          gchar * cpath, gchar * new_text,
-                                                                          gpointer user_data)
+void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
+    (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
+     gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (user_data);
   ts = GTK_TREE_STORE (gtk_builder_get_object
                        (builder, "GNUNET_GTK_pseudonym_tree_store"));
@@ -1011,7 +1006,7 @@ GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter prev;
   GtkTreeIter pos;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1061,7 +1056,7 @@ GNUNET_GTK_master_publish_dialog_left_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter parent;
   GtkTreeIter pos;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1103,7 +1098,7 @@ GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter *pprev;
   GtkTreeIter pos;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1158,7 +1153,7 @@ GNUNET_GTK_master_publish_dialog_down_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter next;
   GtkTreeIter pos;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1197,7 +1192,7 @@ GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter pos;
   struct GNUNET_FS_BlockOptions bo;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1230,15 +1225,16 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
   GtkWidget *ad;
   GtkBuilder *builder;
   GtkWindow *master_pubdialog;
-  
+
   builder = GTK_BUILDER (data);
 
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_publish_file_dialog"));
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
 
-  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
-      "GNUNET_GTK_master_publish_dialog"));
+  master_pubdialog =
+      GTK_WINDOW (gtk_builder_get_object
+                  (builder, "GNUNET_GTK_master_publish_dialog"));
   gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
 
   gtk_window_present (GTK_WINDOW (ad));
@@ -1264,24 +1260,19 @@ struct EditPublishContext
  * @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
  */
 static void
-master_publish_edit_publish_dialog_cb (gpointer cls, 
-                                       int do_index, 
-                                       const char *short_fn,
-                                       uint32_t anonymity_level,
-                                       uint32_t priority, 
-                                       const char *root,
-                                       gint ret)
+master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
+                                       const char *short_fn,
+                                       uint32_t anonymity_level,
+                                       uint32_t priority, const char *root,
+                                       gint ret)
 {
   struct EditPublishContext *cbargs = cls;
-  
+
   GNUNET_assert (NULL == root);
   if (ret == GTK_RESPONSE_OK)
-    gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter,
-                        1, do_index, 
-                        2, short_fn, 
-                        3, (guint) anonymity_level, 
-                        4, (guint) priority, 
-                        -1);
+    gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter, 1, do_index,
+                        2, short_fn, 3, (guint) anonymity_level, 4,
+                        (guint) priority, -1);
   GNUNET_free (cbargs);
 }
 
@@ -1309,8 +1300,9 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
 
   cbargs = GNUNET_malloc (sizeof (struct EditPublishContext));
   cbargs->tm = gtk_tree_view_get_model (tv);
-  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
-                                                         "GNUNET_GTK_master_publish_dialog"));
+  master_pubdialog =
+      GTK_WINDOW (gtk_builder_get_object
+                  (builder, "GNUNET_GTK_master_publish_dialog"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &cbargs->iter))
   {
@@ -1319,21 +1311,14 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
     return;
   }
 
-  gtk_tree_model_get (tm, &cbargs->iter, 
-                      1, &do_index, 
-                      2, &short_fn, 
-                      3, &anonymity_level, 
-                      4, &priority,
-                      5, &fip,
-                      -1);
+  gtk_tree_model_get (tm, &cbargs->iter, 1, &do_index, 2, &short_fn, 3,
+                      &anonymity_level, 4, &priority, 5, &fip, -1);
   /* FIXME: shouldn't this use a fresh builder? */
-  GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, 
-                                     do_index,
-                                     short_fn, 
-                                     (uint32_t) anonymity_level, 
-                                     (uint32_t) priority,
-                                     fip,
-                                     TRUE, &master_publish_edit_publish_dialog_cb, cbargs);
+  GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, do_index,
+                                     short_fn, (uint32_t) anonymity_level,
+                                     (uint32_t) priority, fip, TRUE,
+                                     &master_publish_edit_publish_dialog_cb,
+                                     cbargs);
 }
 
 
@@ -1370,7 +1355,7 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter iter;
   struct GNUNET_FS_FileInformation *fip;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
@@ -1389,8 +1374,9 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
 
 
 void
-GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
-                                                 gint response_id, gpointer user_data)
+GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
+                                                 gint response_id,
+                                                 gpointer user_data)
 {
   char *filename;
   int do_index;
@@ -1400,25 +1386,30 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
   GtkBuilder *builder;
 
   builder = GTK_BUILDER (user_data);
-  ad = GTK_WIDGET (gtk_builder_get_object (builder,
-                                           "GNUNET_GTK_publish_directory_dialog"));
+  ad = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GTK_publish_directory_dialog"));
   if (response_id == -5)
   {
     filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
-    sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
-    if (!GNUNET_GTK_get_selected_anonymity_level (builder,
-        "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
-        &bo.anonymity_level))
+    sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+                          (builder,
+                           "GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
+    if (!GNUNET_GTK_get_selected_anonymity_level
+        (builder, "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
+         &bo.anonymity_level))
       bo.anonymity_level = 1;
-    bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
-        gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
-    bo.replication_level = 0; /* FIXME: replication level in GUI? */
+    bo.content_priority =
+        gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                                   (gtk_builder_get_object
+                                    (builder,
+                                     "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
+    bo.replication_level = 0;   /* FIXME: replication level in GUI? */
     bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
-    do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
-        gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
+    do_index =
+        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+                                      (gtk_builder_get_object
+                                       (builder,
+                                        "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
 
     /* FIXME: open progress dialog here... */
     add_dir (user_data, filename, &bo, do_index);
@@ -1436,14 +1427,15 @@ GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
   GtkWidget *ad;
   GtkBuilder *builder;
   GtkWindow *master_pubdialog;
-  
+
   builder = GTK_BUILDER (data);
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_publish_directory_dialog"));
 
-  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
-      "GNUNET_GTK_master_publish_dialog"));
+  master_pubdialog =
+      GTK_WINDOW (gtk_builder_get_object
+                  (builder, "GNUNET_GTK_master_publish_dialog"));
   gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
 
   gtk_window_present (GTK_WINDOW (ad));
@@ -1564,7 +1556,10 @@ add_updateable_to_ts (void *cls, const char *last_id,
   else
   {
     char *utf8_desc = NULL;
-    utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc, strlen (desc) + 1);
+
+    utf8_desc =
+        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+                                            strlen (desc) + 1);
     GNUNET_free (desc);
     if (utf8_desc != NULL)
       desc = utf8_desc;
@@ -1689,13 +1684,13 @@ free_file_information_tree_store (GtkTreeModel * tm, GtkTreeIter * iter)
 
 
 void
-GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget *widget,
-                                             gpointer user_data)
+GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget * widget,
+                                             gpointer user_data)
 {
   GtkTreeView *tv;
   GtkTreeSelection *sel;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (user_data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1730,9 +1725,10 @@ hide_master_publish_dialog (gpointer user_data, gint ret)
   builder = GTK_BUILDER (user_data);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_master_publish_dialog"));
-  ptv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder,
-                       "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
+  ptv =
+      GTK_TREE_VIEW (gtk_builder_get_object
+                     (builder,
+                      "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
   sel = gtk_tree_view_get_selection (ptv);
   ptm = gtk_tree_view_get_model (ptv);
 
@@ -1740,7 +1736,7 @@ hide_master_publish_dialog (gpointer user_data, gint ret)
                       (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   tm = gtk_tree_view_get_model (tv);
-  
+
   if (ret == GTK_RESPONSE_OK)
   {
     if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
@@ -1787,29 +1783,30 @@ hide_master_publish_dialog (gpointer user_data, gint ret)
   gtk_tree_store_clear (GTK_TREE_STORE (tm));
   gtk_widget_hide (ad);
   /* FIXME: doesn't this leak everything (builder + window)?
-     I think we need to unref the builder here! */
+   * I think we need to unref the builder here! */
 }
 
 
 void
-GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton *button,
-                                                            gpointer user_data)
+GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
+                                                            gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_OK);
 }
 
 
 void
-GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton *button,
-                                                           gpointer user_data)
+GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton * button,
+                                                           gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
 }
 
 
 gboolean
-GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget *widget,
-                                                  GdkEvent *event, gpointer user_data)
+GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget * widget,
+                                                  GdkEvent * event,
+                                                  gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
   return TRUE;
@@ -1817,8 +1814,9 @@ GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget *widget,
 
 
 void
-GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog *dialog,
-                                            gint response_id, gpointer user_data)
+GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
+                                            gint response_id,
+                                            gpointer user_data)
 {
   char *filename;
   struct GNUNET_FS_BlockOptions bo;
@@ -1828,26 +1826,32 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog *dialog,
 
   GtkBuilder *builder = GTK_BUILDER (user_data);
 
-  ad = GTK_WIDGET (gtk_builder_get_object (builder,
-      "GNUNET_GTK_publish_file_dialog"));
+  ad = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GTK_publish_file_dialog"));
 
   if (response_id == -5)
   {
     /* OK */
-    sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
+    sb = GTK_SPIN_BUTTON (gtk_builder_get_object
+                          (builder,
+                           "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
 
-    if (!GNUNET_GTK_get_selected_anonymity_level (builder,
-        "GNUNET_GTK_publish_file_dialog_anonymity_combobox", &bo.anonymity_level))
+    if (!GNUNET_GTK_get_selected_anonymity_level
+        (builder, "GNUNET_GTK_publish_file_dialog_anonymity_combobox",
+         &bo.anonymity_level))
       bo.anonymity_level = 1;
-    bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
-        gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
+    bo.content_priority =
+        gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                                   (gtk_builder_get_object
+                                    (builder,
+                                     "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
     bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
-    bo.replication_level = 1;     /* FIXME... */
-    do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
-        gtk_builder_get_object (builder,
-        "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
+    bo.replication_level = 1;   /* FIXME... */
+    do_index =
+        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+                                      (gtk_builder_get_object
+                                       (builder,
+                                        "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
 
     filename = GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (ad));
     add_file_at_iter (user_data, filename, &bo, do_index, NULL);
@@ -1870,16 +1874,16 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
   GtkWidget *ad;
   GtkTreeStore *ts;
   GtkBuilder *builder;
-  
+
   builder = GTK_BUILDER (data);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_master_publish_dialog"));
   if (!gtk_widget_get_visible (ad))
   {
-    ts = GTK_TREE_STORE (gtk_builder_get_object (builder,
-        "GNUNET_GTK_pseudonym_tree_store"));
+    ts = GTK_TREE_STORE (gtk_builder_get_object
+                         (builder, "GNUNET_GTK_pseudonym_tree_store"));
     GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
-        &add_namespace_to_ts, ts);
+                              &add_namespace_to_ts, ts);
   }
   gtk_window_present (GTK_WINDOW (ad));
 }