1 files changed, 145 insertions, 89 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 257fb311..896ae708 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -120,20 +120,26 @@ GNUNET_GTK_quit_cb (GObject * object, gpointer user_data)
 {
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                      &shutdown_task, NULL);
+                                      &shutdown_task, NULL);
 }
 
 
 void
-main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *togglebutton,
-                                                        gpointer user_data)
+main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
+                                                         togglebutton,
+                                                         gpointer user_data)
 {
   gboolean active;
   GtkBuilder *builder = GTK_BUILDER (user_data);
   GtkWidget *namespace_selector_window;
   GtkWidget *namespace_selector_treeview;
-  namespace_selector_window = GTK_WIDGET (gtk_builder_get_object (builder, "namespace_selector_window"));
-  namespace_selector_treeview = GTK_WIDGET (gtk_builder_get_object (builder, "namespace_selector_treeview"));
+
+  namespace_selector_window =
+      GTK_WIDGET (gtk_builder_get_object
+                  (builder, "namespace_selector_window"));
+  namespace_selector_treeview =
+      GTK_WIDGET (gtk_builder_get_object
+                  (builder, "namespace_selector_treeview"));
   g_object_get (G_OBJECT (togglebutton), "active", &active, NULL);
   if (active)
   {
@@ -141,7 +147,8 @@ main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *toggle
     GdkWindow *main_window_gdk;
     gint mwg_x, mwg_y, tgb_x, tgb_y, popup_x, popup_y;
 
-    gtk_widget_get_allocation (GTK_WIDGET (togglebutton), &togglebutton_allocation);
+    gtk_widget_get_allocation (GTK_WIDGET (togglebutton),
+                               &togglebutton_allocation);
 
     main_window_gdk = gtk_widget_get_window (GTK_WIDGET (togglebutton));
 
@@ -172,14 +179,19 @@ gboolean
 namespace_selector_window_leave_timeout_cb (gpointer user_data)
 {
   GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (user_data);
+
   /* This will eventually hide the namespace selector */
   gtk_toggle_button_set_active (toggle_button, FALSE);
   return FALSE;
 }
 
 gboolean
-main_window_search_namespace_dropdown_button_enter_notify_event_cb (
-    GtkWidget *widget, GdkEvent *event, gpointer user_data)
+main_window_search_namespace_dropdown_button_enter_notify_event_cb (GtkWidget *
+                                                                    widget,
+                                                                    GdkEvent *
+                                                                    event,
+                                                                    gpointer
+                                                                    user_data)
 {
   if (namespace_selector_window_leave_timeout_source > 0)
     g_source_remove (namespace_selector_window_leave_timeout_source);
@@ -188,8 +200,9 @@ main_window_search_namespace_dropdown_button_enter_notify_event_cb (
 
 
 gboolean
-namespace_selector_window_leave_notify_event_cb (GtkWidget *widget,
-    GdkEvent  *event, gpointer user_data)
+namespace_selector_window_leave_notify_event_cb (GtkWidget * widget,
+                                                 GdkEvent * event,
+                                                 gpointer user_data)
 {
   GtkBuilder *builder;
   GtkToggleButton *toggle_button;
@@ -197,12 +210,17 @@ namespace_selector_window_leave_notify_event_cb (GtkWidget *widget,
 
   builder = GTK_BUILDER (user_data);
 
-  toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "main_window_search_namespace_dropdown_button"));
+  toggle_button =
+      GTK_TOGGLE_BUTTON (gtk_builder_get_object
+                         (builder,
+                          "main_window_search_namespace_dropdown_button"));
 
   /* Place a timeout to hide the window. It will be cancelled if the cursor
    * enters the namespace selector window or the toggle button within 100ms.
    */
-  timeout_id = g_timeout_add (100, &namespace_selector_window_leave_timeout_cb, toggle_button);
+  timeout_id =
+      g_timeout_add (100, &namespace_selector_window_leave_timeout_cb,
+                     toggle_button);
   if (namespace_selector_window_leave_timeout_source > 0)
     g_source_remove (namespace_selector_window_leave_timeout_source);
   namespace_selector_window_leave_timeout_source = timeout_id;
@@ -211,8 +229,8 @@ namespace_selector_window_leave_notify_event_cb (GtkWidget *widget,
 }
 
 gboolean
-GNUNET_GTK_get_tree_string (GtkTreeView *treeview, GtkTreePath *treepath,
-    guint column, gchar **value)
+GNUNET_GTK_get_tree_string (GtkTreeView * treeview, GtkTreePath * treepath,
+                            guint column, gchar ** value)
 {
   gboolean ok;
   GtkTreeModel *model;
@@ -222,6 +240,7 @@ GNUNET_GTK_get_tree_string (GtkTreeView *treeview, GtkTreePath *treepath,
     return FALSE;
 
   GtkTreeIter iter;
+
   ok = gtk_tree_model_get_iter (model, &iter, treepath);
   if (!ok)
     return FALSE;
@@ -234,7 +253,8 @@ GNUNET_GTK_get_tree_string (GtkTreeView *treeview, GtkTreePath *treepath,
 }
 
 gboolean
-GNUNET_GTK_get_selected_anonymity_level (GtkBuilder *builder, gchar *combo_name, guint *p_level)
+GNUNET_GTK_get_selected_anonymity_level (GtkBuilder * builder,
+                                         gchar * combo_name, guint * p_level)
 {
   GtkComboBox *combo;
   GtkTreeIter iter;
@@ -259,7 +279,8 @@ GNUNET_GTK_get_selected_anonymity_level (GtkBuilder *builder, gchar *combo_name,
 }
 
 gboolean
-GNUNET_GTK_select_anonymity_level (GtkBuilder *builder, gchar *combo_name, guint sel_level)
+GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name,
+                                   guint sel_level)
 {
   GtkComboBox *combo;
   GtkTreeIter iter;
@@ -275,9 +296,8 @@ GNUNET_GTK_select_anonymity_level (GtkBuilder *builder, gchar *combo_name, guint
   if (!model)
     return FALSE;
 
-  for (go_on = gtk_tree_model_get_iter_first (model, &iter);
-      go_on;
-      go_on = gtk_tree_model_iter_next (model, &iter))
+  for (go_on = gtk_tree_model_get_iter_first (model, &iter); go_on;
+       go_on = gtk_tree_model_iter_next (model, &iter))
   {
     gtk_tree_model_get (model, &iter, 1, &level, -1);
     if (level == sel_level)
@@ -290,9 +310,11 @@ GNUNET_GTK_select_anonymity_level (GtkBuilder *builder, gchar *combo_name, guint
 }
 
 gboolean
-get_selected_namespace_treepath_iter_model_widget (GtkBuilder *builder,
-    GtkTreePath **p_treepath, GtkTreeIter *p_iter, GtkTreeModel **p_model,
-    GtkWidget **p_widget)
+get_selected_namespace_treepath_iter_model_widget (GtkBuilder * builder,
+                                                   GtkTreePath ** p_treepath,
+                                                   GtkTreeIter * p_iter,
+                                                   GtkTreeModel ** p_model,
+                                                   GtkWidget ** p_widget)
 {
   GtkTreeSelection *selection;
   GtkTreeModel *model;
@@ -300,7 +322,9 @@ get_selected_namespace_treepath_iter_model_widget (GtkBuilder *builder,
   GtkTreePath *treepath;
   GtkWidget *widget;
 
-  widget = GTK_WIDGET (gtk_builder_get_object (builder, "namespace_selector_treeview"));
+  widget =
+      GTK_WIDGET (gtk_builder_get_object
+                  (builder, "namespace_selector_treeview"));
   if (!widget)
     return FALSE;
 
@@ -338,8 +362,8 @@ get_selected_namespace_treepath_iter_model_widget (GtkBuilder *builder,
 }
 
 void
-namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
-    gpointer user_data)
+namespace_selector_treeview_cursor_changed_cb (GtkWidget * widget,
+                                               gpointer user_data)
 {
   GtkBuilder *builder;
   GtkToggleButton *toggle_button;
@@ -352,15 +376,20 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
 
   builder = GTK_BUILDER (user_data);
 
-  toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "main_window_search_namespace_dropdown_button"));
+  toggle_button =
+      GTK_TOGGLE_BUTTON (gtk_builder_get_object
+                         (builder,
+                          "main_window_search_namespace_dropdown_button"));
   if (!toggle_button)
     return;
 
-  search_entry = GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
+  search_entry =
+      GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
   if (!search_entry)
     return;
 
-  if (!get_selected_namespace_treepath_iter_model_widget (builder, &treepath, NULL, &model, NULL))
+  if (!get_selected_namespace_treepath_iter_model_widget
+      (builder, &treepath, NULL, &model, NULL))
     return;
   ref = gtk_tree_row_reference_new (model, treepath);
   old = g_object_get_data (G_OBJECT (toggle_button), "selected-row-reference");
@@ -369,18 +398,20 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
   g_object_set_data (G_OBJECT (toggle_button), "selected-row-reference", ref);
 
 
-  sel_namespace_label = GTK_LABEL (gtk_builder_get_object (builder, "main_window_search_selected_namespace_label"));
+  sel_namespace_label =
+      GTK_LABEL (gtk_builder_get_object
+                 (builder, "main_window_search_selected_namespace_label"));
   if (!sel_namespace_label)
     return;
 
-  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0,
-      &value) && value != NULL)
+  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 0, &value)
+      && value != NULL)
   {
     gtk_label_set_text (sel_namespace_label, value);
     g_free (value);
   }
-  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2,
-      &value) && value != NULL)
+  if (GNUNET_GTK_get_tree_string (GTK_TREE_VIEW (widget), treepath, 2, &value)
+      && value != NULL)
   {
     gtk_entry_set_text (search_entry, value);
     g_free (value);
@@ -393,7 +424,7 @@ namespace_selector_treeview_cursor_changed_cb (GtkWidget *widget,
 }
 
 GtkTreeRowReference *
-get_ns_selected_row (GtkTreeView *tree)
+get_ns_selected_row (GtkTreeView * tree)
 {
   GtkTreeSelection *sel;
   GList *rows, *row;
@@ -414,8 +445,9 @@ get_ns_selected_row (GtkTreeView *tree)
 }
 
 gboolean
-namespace_selector_treeview_button_press_event_cb (GtkWidget *widget,
-    GdkEvent *event, gpointer user_data)
+namespace_selector_treeview_button_press_event_cb (GtkWidget * widget,
+                                                   GdkEvent * event,
+                                                   gpointer user_data)
 {
   GtkTreeRowReference *ref = NULL;
 
@@ -423,6 +455,7 @@ namespace_selector_treeview_button_press_event_cb (GtkWidget *widget,
   if (ref != NULL)
   {
     gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
+
     if (old)
       gtk_tree_row_reference_free (old);
     g_object_set_data (G_OBJECT (widget), "pushed-rowreference", ref);
@@ -431,8 +464,9 @@ namespace_selector_treeview_button_press_event_cb (GtkWidget *widget,
 }
 
 gboolean
-namespace_selector_treeview_button_release_event_cb (GtkWidget *widget,
-    GdkEvent *event, gpointer user_data)
+namespace_selector_treeview_button_release_event_cb (GtkWidget * widget,
+                                                     GdkEvent * event,
+                                                     gpointer user_data)
 {
   GtkTreeRowReference *ref = NULL;
   gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
@@ -441,6 +475,7 @@ namespace_selector_treeview_button_release_event_cb (GtkWidget *widget,
   if (ref && old)
   {
     GtkTreePath *path_ref, *path_old;
+
     path_ref = gtk_tree_row_reference_get_path (ref);
     path_old = gtk_tree_row_reference_get_path (old);
     if (gtk_tree_path_compare (path_ref, path_old) == 0)
@@ -459,7 +494,7 @@ namespace_selector_treeview_button_release_event_cb (GtkWidget *widget,
 }
 
 void
-main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
+main_window_search_button_clicked_cb (GtkButton * button, gpointer user_data)
 {
   GtkBuilder *builder;
   GtkTreePath *namespace_treepath = NULL;
@@ -481,19 +516,22 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
 
   builder = GTK_BUILDER (user_data);
 
-  toggle_button = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
-      "main_window_search_namespace_dropdown_button"));
+  toggle_button =
+      GTK_TOGGLE_BUTTON (gtk_builder_get_object
+                         (builder,
+                          "main_window_search_namespace_dropdown_button"));
 
-  if (!GNUNET_GTK_get_selected_anonymity_level (builder,
-      "main_window_search_anonymity_combobox", &anonymity_level))
+  if (!GNUNET_GTK_get_selected_anonymity_level
+      (builder, "main_window_search_anonymity_combobox", &anonymity_level))
     return;
 
-  mime_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object
-      ("main_window_search_mime_combobox"));
+  mime_combo =
+      GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object
+                     ("main_window_search_mime_combobox"));
   mime_model = gtk_combo_box_get_model (mime_combo);
-  mime_keyword = NULL; 
-  if (mime_model && gtk_combo_box_get_active_iter (mime_combo, &iter))  
-    gtk_tree_model_get (mime_model, &iter, 0, &mime_keyword, -1);  
+  mime_keyword = NULL;
+  if (mime_model && gtk_combo_box_get_active_iter (mime_combo, &iter))
+    gtk_tree_model_get (mime_model, &iter, 0, &mime_keyword, -1);
   if (strcmp (mime_keyword, " ") == 0)
   {
     g_free (mime_keyword);
@@ -505,14 +543,17 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
   {
     namespace_model = gtk_tree_row_reference_get_model (ref);
     namespace_treepath = gtk_tree_row_reference_get_path (ref);
-    if ( (NULL != namespace_treepath) &&
-         (TRUE == gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath)) )
+    if ((NULL != namespace_treepath) &&
+        (TRUE ==
+         gtk_tree_model_get_iter (namespace_model, &iter, namespace_treepath)))
       gtk_tree_model_get (namespace_model, &iter, 1, &nsid, -1);
   }
-  query_entry = GTK_ENTRY (gtk_builder_get_object (builder,
-                                                   "main_window_search_entry"));
+  query_entry =
+      GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
   entry_keywords = gtk_entry_get_text (query_entry);
-  keywords = g_strdup_printf ("%s %s%s", entry_keywords, mime_keyword ? "+" : "", mime_keyword ? mime_keyword : "");
+  keywords =
+      g_strdup_printf ("%s %s%s", entry_keywords, mime_keyword ? "+" : "",
+                       mime_keyword ? mime_keyword : "");
   g_free (mime_keyword);
   if (nsid != NULL)
   {
@@ -525,14 +566,14 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
     uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
     if (uri == NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-          _("Invalid keyword string `%s': %s"), keywords, emsg);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid keyword string `%s': %s"),
+                  keywords, emsg);
       GNUNET_free_non_null (emsg);
       return;
     }
   }
-  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
-      anonymity_level, GNUNET_FS_SEARCH_OPTION_NONE, NULL);
+  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri, anonymity_level,
+                          GNUNET_FS_SEARCH_OPTION_NONE, NULL);
 
   g_free (keywords);
   GNUNET_FS_uri_destroy (uri);
@@ -540,16 +581,19 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
 
 
 gboolean
-main_window_search_entry_key_press_event_cb (GtkWidget *widget,
-    GdkEventKey *event, gpointer user_data)
+main_window_search_entry_key_press_event_cb (GtkWidget * widget,
+                                             GdkEventKey * event,
+                                             gpointer user_data)
 {
   GtkBuilder *builder;
+
   builder = GTK_BUILDER (user_data);
 
   if (event->keyval == GDK_KEY_Return)
   {
     GtkWidget *find = GTK_WIDGET (gtk_builder_get_object (builder,
-        "main_window_search_button"));
+                                                          "main_window_search_button"));
+
     main_window_search_button_clicked_cb (GTK_BUTTON (find), user_data);
     return TRUE;
   }
@@ -567,7 +611,7 @@ main_window_search_entry_key_press_event_cb (GtkWidget *widget,
  */
 static int
 add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
-    const struct GNUNET_CONTAINER_MetaData *md, int rating)
+                     const struct GNUNET_CONTAINER_MetaData *md, int rating)
 {
   GtkTreeStore *ts = cls;
   char *root;
@@ -611,7 +655,10 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   else
   {
     char *utf8_desc = NULL;
-    utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, description, strlen (description));
+
+    utf8_desc =
+        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
+                                            description, strlen (description));
     GNUNET_free (description);
     if (utf8_desc != NULL)
       description = utf8_desc;
@@ -619,7 +666,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
       description = NULL;
   }
   gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 0, ns_name, 1,
-      nsid, 2, root, 3, description, -1);
+                                     nsid, 2, root, 3, description, -1);
   GNUNET_free (ns_name);
   GNUNET_free_non_null (root);
   GNUNET_free_non_null (description);
@@ -627,7 +674,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
 }
 
 void
-GNUNET_GTK_main_window_realize_cb (GtkWidget *widget, gpointer user_data)
+GNUNET_GTK_main_window_realize_cb (GtkWidget * widget, gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeView *namespace_tree;
@@ -638,15 +685,19 @@ GNUNET_GTK_main_window_realize_cb (GtkWidget *widget, gpointer user_data)
 
   builder = GTK_BUILDER (user_data);
 
-  namespace_treestore = GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object
-      ("main_window_search_namespace_treestore"));
-  namespace_tree = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
-      ("namespace_selector_treeview"));
-  metadata_tree = GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
-      ("GNUNET_GTK_main_window_metadata_treeview"));
+  namespace_treestore =
+      GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object
+                      ("main_window_search_namespace_treestore"));
+  namespace_tree =
+      GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
+                     ("namespace_selector_treeview"));
+  metadata_tree =
+      GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
+                     ("GNUNET_GTK_main_window_metadata_treeview"));
 
   /* Allow multiple selection in metadata view */
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metadata_tree), GTK_SELECTION_MULTIPLE);
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metadata_tree),
+                               GTK_SELECTION_MULTIPLE);
 
   /* FIXME: find a way to manage pseudonyms.
    * Right now the list will be filled with ALL and ANY pseudonyms that we
@@ -657,33 +708,40 @@ GNUNET_GTK_main_window_realize_cb (GtkWidget *widget, gpointer user_data)
    * drag them around to change the order in which they appear in the list.
    * All that is not possible with a simple "files in a directory" concept.
    */
-  gtk_tree_store_insert_with_values (namespace_treestore, &iter, NULL,
-      G_MAXINT, 0, "Any", 1, NULL, 2, "", 3,
-      "Do not search in any particular namespace", -1);
+  gtk_tree_store_insert_with_values (namespace_treestore, &iter, NULL, G_MAXINT,
+                                     0, "Any", 1, NULL, 2, "", 3,
+                                     "Do not search in any particular namespace",
+                                     -1);
   /*
-  GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
-                             &add_namespace_to_ts, namespace_treestore);
-  */
-  GNUNET_PSEUDONYM_discovery_callback_register (
-      GNUNET_FS_GTK_get_configuration (),
-      &add_namespace_to_ts, namespace_treestore);
+   * GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
+   * &add_namespace_to_ts, namespace_treestore);
+   */
+  GNUNET_PSEUDONYM_discovery_callback_register (GNUNET_FS_GTK_get_configuration
+                                                (), &add_namespace_to_ts,
+                                                namespace_treestore);
 
   /* FIXME: read currently selected namespace from somewhere instead of selecting 0th item */
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (namespace_treestore), &iter))
+  if (gtk_tree_model_get_iter_first
+      (GTK_TREE_MODEL (namespace_treestore), &iter))
   {
     gchar *value;
     GtkLabel *sel_namespace_label;
     GtkTreePath *treepath = gtk_tree_path_new_first ();
-    gtk_tree_selection_select_iter (gtk_tree_view_get_selection (
-        namespace_tree), &iter);
-    sel_namespace_label = GTK_LABEL (gtk_builder_get_object (builder, "main_window_search_selected_namespace_label"));
+
+    gtk_tree_selection_select_iter (gtk_tree_view_get_selection
+                                    (namespace_tree), &iter);
+    sel_namespace_label =
+        GTK_LABEL (gtk_builder_get_object
+                   (builder, "main_window_search_selected_namespace_label"));
     if (GNUNET_GTK_get_tree_string (namespace_tree, treepath, 0, &value))
       gtk_label_set_text (sel_namespace_label, value);
     gtk_tree_path_free (treepath);
   }
 
   /* How the window (to trigger certain events) and immediately hide it */
-  namespace_selector_window = GTK_WIDGET (gtk_builder_get_object (builder, "namespace_selector_window"));
+  namespace_selector_window =
+      GTK_WIDGET (gtk_builder_get_object
+                  (builder, "namespace_selector_window"));
   gtk_widget_show (namespace_selector_window);
   gtk_widget_hide (namespace_selector_window);
 
@@ -714,10 +772,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   /* initialize file-sharing */
   plugins = EXTRACTOR_plugin_add_defaults (EXTRACTOR_OPTION_DEFAULT_POLICY);
-  fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml),
-                        "gnunet-gtk", &GNUNET_GTK_fs_event_handler, NULL,
-                        GNUNET_FS_FLAGS_NONE /* | GNUNET_FS_FLAGS_PERSISTENCE |
-                        GNUNET_FS_FLAGS_DO_PROBES*/,
+  fs = GNUNET_FS_start (GNUNET_GTK_main_loop_get_configuration (ml), "gnunet-gtk", &GNUNET_GTK_fs_event_handler, NULL, GNUNET_FS_FLAGS_NONE     /* | GNUNET_FS_FLAGS_PERSISTENCE |
+                                                                                                                                                 * GNUNET_FS_FLAGS_DO_PROBES */ ,
                         GNUNET_FS_OPTIONS_END);
   if (fs != NULL)
   {