-remove tailing whitespaces

37 files changed, 802 insertions, 802 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 739ff005..4b3f0c35 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -192,12 +192,12 @@ main_window_save_position (GtkWidget *main_window)
   GNUNET_CONFIGURATION_set_value_number (cfg, "gnunet-fs-gtk",
                                          "MAIN_WINDOW_HEIGHT", window_height);
   GNUNET_CONFIGURATION_set_value_string (cfg, "gnunet-fs-gtk",
-                                         "MAIN_WINDOW_MAXIMIZED", 
+                                         "MAIN_WINDOW_MAXIMIZED",
                                          (maximized == GNUNET_YES) ? "YES" : "NO");
 
   cfgDefault = GNUNET_CONFIGURATION_create ();
   (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */
-  GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg, 
+  GNUNET_CONFIGURATION_write_diffs (cfgDefault, cfg,
                                     GNUNET_GTK_main_loop_get_configuration_file (ml));
   GNUNET_CONFIGURATION_destroy (cfgDefault);
 }
@@ -231,7 +231,7 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
  */
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{  
+{
   struct SearchLookup *sl;
   struct PseuLookupContext *lctx;
 
@@ -267,10 +267,10 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_IDENTITY_disconnect (main_context.identity);
     main_context.identity = NULL;
   }
-  while (NULL != (sl = main_context.sl_head)) 
-    abort_search_lookup (sl);  
-  while (NULL != (lctx = main_context.lctx_head)) 
-    abort_pseu_lookup (lctx);  
+  while (NULL != (sl = main_context.sl_head))
+    abort_search_lookup (sl);
+  while (NULL != (lctx = main_context.lctx_head))
+    abort_pseu_lookup (lctx);
   if (NULL != main_context.zm)
   {
     GNUNET_NAMESTORE_zone_monitor_stop (main_context.zm);
@@ -372,7 +372,7 @@ process_paste (GtkClipboard *cb,
  *         TRUE if there is now a pop-up menu
  */
 gboolean
-GNUNET_FS_GTK_main_window_button_press_event (GtkWidget * widget, 
+GNUNET_FS_GTK_main_window_button_press_event (GtkWidget * widget,
                                               GdkEvent * event,
                                               gpointer user_data)
 {
@@ -500,8 +500,8 @@ format_service_list (unsigned int count, const char *const*list)
 
 
 static void
-service_list_callback (void *cls, 
-                       enum GNUNET_ARM_RequestStatus rs, 
+service_list_callback (void *cls,
+                       enum GNUNET_ARM_RequestStatus rs,
                        unsigned int count,
                        const char *const*list)
 {
@@ -537,7 +537,7 @@ arm_connection_state_change (void *cls,
 
 static void
 service_status_change (void *cls,
-                       const char *service, 
+                       const char *service,
                        enum GNUNET_ARM_ServiceStatus status)
 {
   /* Very crude, we can probably do better.
@@ -545,7 +545,7 @@ service_status_change (void *cls,
    * to service status changes, then update the indicator,
    * without requesting a list from ARM every goddamned time?
    */
-  GNUNET_ARM_request_service_list (arm, 
+  GNUNET_ARM_request_service_list (arm,
                                    SERVICE_LIST_TIMEOUT,
                                    &service_list_callback, cls);
 }
@@ -563,7 +563,7 @@ service_status_change (void *cls,
  * @param rd_count number of entries in @a rd array; 0 on removal
  * @param rd array of records for the label
  */
-static void 
+static void
 monitor_zone_records (void *cls,
                       const struct GNUNET_CRYPTO_EccPrivateKey *zone,
                       const char *label,
@@ -591,7 +591,7 @@ monitor_zone_records (void *cls,
     if (gtk_tree_model_get_iter_first (tm, &iter))
       do
         {
-          gtk_tree_model_get (tm, &iter, 
+          gtk_tree_model_get (tm, &iter,
                               0, &id,
                               -1);
           if (0 == strcmp (id, label_gnu))
@@ -635,7 +635,7 @@ handle_sks_zone_identity (void *cls,
                           const char *name)
 {
   main_context.id_op = NULL;
-  
+
   if (NULL == ego)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -649,7 +649,7 @@ handle_sks_zone_identity (void *cls,
   main_context.zm = GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg,
                                                          main_context.sks_zone,
                                                          &monitor_zone_records,
-                                                         NULL, 
+                                                         NULL,
                                                          NULL);
 }
 
@@ -739,7 +739,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     /* If anything is wrong - play safe and show it maximized */
     gtk_window_maximize (GTK_WINDOW (main_context.main_window));
   }
-  
+
   /* Allow multiple selection in metadata view; */
   /* FIXME-GTK3: this can be done within (modern versions of) glade */
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (main_context.md_treeview),
@@ -762,7 +762,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   /* initialize file-sharing */
   fs = GNUNET_FS_start (main_context.cfg, "gnunet-fs-gtk",
-                        &GNUNET_GTK_fs_event_handler, NULL, 
+                        &GNUNET_GTK_fs_event_handler, NULL,
                         GNUNET_FS_FLAGS_PERSISTENCE | GNUNET_FS_FLAGS_DO_PROBES,
                         GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
                         (unsigned int) dl_parallel,
@@ -793,12 +793,12 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     gtk_widget_show (main_context.main_window);
     gtk_window_present (GTK_WINDOW (main_context.main_window));
   }
-  
+
   {
     char *const *argv;
     int argc;
     int i;
-    
+
     GNUNET_GTK_main_loop_get_args (ml, &argc, &argv);
 
     for (i = 0; i < argc; i++)
@@ -826,7 +826,7 @@ main (int argc, char **argv)
      gettext_noop ("start in tray mode"), 0,
      &GNUNET_GETOPT_set_one, &tray_only},
     GNUNET_GETOPT_OPTION_END
-  };  
+  };
 #if HAVE_LIBUNIQUE
   int arge;
 
@@ -845,7 +845,7 @@ main (int argc, char **argv)
       UniqueMessageData *msg;
 
       msg = unique_message_data_new ();
-      unique_message_data_set_text (msg, argv[arge], strlen (argv[arge])+1);      
+      unique_message_data_set_text (msg, argv[arge], strlen (argv[arge])+1);
       if (UNIQUE_RESPONSE_OK == response)
         response = unique_app_send_message (unique_app,
                                             UNIQUE_OPEN,
@@ -857,14 +857,14 @@ main (int argc, char **argv)
 
     return (UNIQUE_RESPONSE_OK == response) ? 0 : 1;
   }
-  
+
 #endif
   if (GNUNET_OK !=
-      GNUNET_GTK_main_loop_start ("gnunet-fs-gtk", 
-                                  "GTK GUI for GNUnet", 
+      GNUNET_GTK_main_loop_start ("gnunet-fs-gtk",
+                                  "GTK GUI for GNUnet",
                                   argc, argv,
                                   options,
-                                  "gnunet_fs_gtk_main_window.glade", 
+                                  "gnunet_fs_gtk_main_window.glade",
                                   &run))
   {
 #if HAVE_LIBUNIQUE
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index fd0c8419..295a513e 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -78,7 +78,7 @@ struct SearchLookup
  */
 struct PseuLookupContext
 {
-  
+
   /**
    * Kept in a DLL.
    */
@@ -97,7 +97,7 @@ struct PseuLookupContext
   /**
    * Lookup request with GNS.
    */
-  struct GNUNET_GNS_LookupRequest *lr;  
+  struct GNUNET_GNS_LookupRequest *lr;
 
   /**
    * Builder for the progress dialog that is displayed.
@@ -132,7 +132,7 @@ struct PseuLookupContext
   /**
    * Public key of the namespace we are trying to save.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey pkey;  
+  struct GNUNET_CRYPTO_EccPublicSignKey pkey;
 
   /**
    * Nickname we're saving under.
@@ -272,12 +272,12 @@ enum GNUNET_GTK_FS_MAIN_WINDOW_SearchNamespaceModelColumns
      * A gpointer.
      */
     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY = 1,
-    
+
     /**
      * A gchararray.
      */
     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_ROOT = 2,
-    
+
     /**
      * A gchararray.
      */
@@ -299,12 +299,12 @@ enum GNUNET_GTK_FS_MAIN_WINDOW_MetaDataModelColumns
      * A guint.
      */
     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_FORMAT = 1,
-    
+
     /**
      * A gchararray.
      */
     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_TYPE_STRING = 2,
-    
+
     /**
      * A gchararray.
      */
diff --git a/src/fs/gnunet-fs-gtk_anonymity-widgets.c b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
index 283899ee..14362e01 100644
--- a/src/fs/gnunet-fs-gtk_anonymity-widgets.c
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
@@ -125,7 +125,7 @@ GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level)
       gtk_combo_box_set_active_iter (combo, &iter);
       return TRUE;
     }
-  } 
+  }
   while (gtk_tree_model_iter_next (model, &iter));
   return FALSE;
 }
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index dcfbfa9f..a35e3d1e 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -54,11 +54,11 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
       return GNUNET_strdup (data);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 _("Failed to validate supposedly utf-8 string `%s' of length %u, assuming it to be a C string\n"),
-                data, 
+                data,
                 (unsigned int) data_len);
     format = EXTRACTOR_METAFORMAT_C_STRING;
     /* fall-through */
-  case EXTRACTOR_METAFORMAT_C_STRING:  
+  case EXTRACTOR_METAFORMAT_C_STRING:
     if (data_len > 0)
     {
       /* There are no guarantees that data is NULL-terminated, AFAIU,
@@ -117,7 +117,7 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
                                      GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_VALUE,
                                      data_to_insert,
                                      -1);
-  GNUNET_free (data_to_insert); 
+  GNUNET_free (data_to_insert);
   return 0;
 }
 
@@ -223,7 +223,7 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
  * @return description of the result in utf-8, never NULL
  */
 char *
-GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta, 
+GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta,
                                              int *is_a_dup)
 {
   char *desc;
@@ -277,8 +277,8 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
   GtkComboBox *ns_cb;
   GtkEntry *ns_entry;
   struct GNUNET_CRYPTO_EccPublicSignKey want;
-  
-  
+
+
   if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
   {
     struct DownloadEntry *de;
@@ -291,7 +291,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
   }
   query_entry = GTK_ENTRY (GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry"));
   ns_cb = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox"));
-  ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb)));  
+  ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb)));
   if (GNUNET_FS_uri_test_sks (uri))
   {
     /* select the namespace */
@@ -315,7 +315,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
       query_string = GNUNET_FS_uri_sks_get_content_id (uri);
       gtk_entry_set_text (query_entry,
                           query_string);
-      GNUNET_free (query_string);    
+      GNUNET_free (query_string);
     }
     return;
   }
@@ -329,7 +329,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
 
       query_string = GNUNET_FS_uri_ksk_to_string_fancy (uri);
       gtk_entry_set_text (query_entry,
-                          query_string);  
+                          query_string);
       GNUNET_free (query_string);
     }
     return;
@@ -413,9 +413,9 @@ GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter)
  *         FALSE if ran out of parents
  */
 gboolean
-GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model, 
-                                          GtkTreeIter *iter, 
-                                          gboolean allow_children, 
+GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model,
+                                          GtkTreeIter *iter,
+                                          gboolean allow_children,
                                           GtkTreeIter *next_iter)
 {
   GtkTreeIter current_iter = *iter;
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 9cc7ee29..bd9da77b 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -110,7 +110,7 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
  * @return description of the result in utf-8, never NULL
  */
 char *
-GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta, 
+GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta,
                                              int *is_a_dup);
 
 
@@ -134,7 +134,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
  * @return #GNUNET_OK if iter was filled, #GNUNET_SYSERR otherwise
  */
 int
-GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, 
+GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr,
                                     GtkTreeIter *iter);
 
 
@@ -146,7 +146,7 @@ GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr,
  * @return newly created reference or NULL in case of error
  */
 GtkTreeRowReference *
-GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, 
+GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model,
                                     GtkTreeIter *iter);
 
 
@@ -169,8 +169,8 @@ GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model,
  */
 gboolean
 GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model,
-                                          GtkTreeIter *iter, 
-                                          gboolean allow_children, 
+                                          GtkTreeIter *iter,
+                                          gboolean allow_children,
                                           GtkTreeIter *next_iter);
 
 
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 5ebaed70..aa0d3604 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -20,7 +20,7 @@
 
 /**
  * @file src/fs/gnunet-fs-gtk_download-save-as.c
- * @brief functions for managing the 'save as' dialog 
+ * @brief functions for managing the 'save as' dialog
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk_download-save-as.h"
@@ -43,7 +43,7 @@ struct DownloadAsDialogContext
    * Builder for the dialog.
    */
   GtkBuilder *builder;
-  
+
   /**
    * Main dialog object.
    */
@@ -97,13 +97,13 @@ GNUNET_FS_GTK_free_download_entry (struct DownloadEntry *de)
   GNUNET_assert (NULL == de->dc);
   if (NULL != de->sr)
   {
-    GNUNET_assert (de->sr->download == de); 
+    GNUNET_assert (de->sr->download == de);
     de->sr->download = NULL;
     de->sr = NULL;
   }
   GNUNET_free_non_null (de->filename);
   GNUNET_FS_uri_destroy (de->uri);
-  GNUNET_free (de);  
+  GNUNET_free (de);
 }
 
 
@@ -136,7 +136,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
  * @param user_data the 'structDownloadAsDialogContext' of the dialog
  */
 void
-GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog, 
+GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
                                        gint response_id,
                                        gpointer user_data)
 {
@@ -148,7 +148,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
   if (GTK_RESPONSE_OK != response_id)
   {
     GNUNET_FS_GTK_free_download_entry (de);
-    gtk_widget_destroy (GTK_WIDGET (dialog));    
+    gtk_widget_destroy (GTK_WIDGET (dialog));
     clean_up_download_as_context (dlc);
     return;
   }
@@ -319,25 +319,25 @@ GNUNET_FS_GTK_download_context_start_download (struct DownloadEntry *de)
   if ((NULL != de->sr) && (NULL != de->sr->result))
   {
     GNUNET_break (NULL !=
-                  GNUNET_FS_download_start_from_search (fs, 
+                  GNUNET_FS_download_start_from_search (fs,
                                                         de->sr->result,
                                                         de->filename,
                                                         NULL /* tempname */ ,
                                                         0 /* offset */ ,
-                                                        len, 
+                                                        len,
                                                         de->anonymity, opt,
                                                         de));
   }
   else
   {
     GNUNET_break (NULL !=
-                  GNUNET_FS_download_start (fs, 
-                                            de->uri, 
+                  GNUNET_FS_download_start (fs,
+                                            de->uri,
                                             NULL /* meta data */,
                                             de->filename, NULL /* tempname */ ,
                                             0 /* offset */ ,
-                                            len, 
-                                            de->anonymity, opt, 
+                                            len,
+                                            de->anonymity, opt,
                                             de,
                                             (NULL != de->pde) ? de->pde->dc : NULL));
   }
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 0b96dc52..dc01c04c 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -184,7 +184,7 @@ enum PUBLISH_TAB_ModelColumns
 /**
  * We have a single tab where we display publishing operations.
  * So there is only one instance of this struct.
- */ 
+ */
 struct PublishTab
 {
 
@@ -317,9 +317,9 @@ static struct GNUNET_FS_AnimationContext *animation_found_sources;
 static struct GNUNET_FS_AnimationContext *animation_error;
 
 
-/** 
+/**
  * Get the handle to the current search tab.
- * 
+ *
  * @return handle to the current search tab.
  */
 struct SearchTab *
@@ -331,9 +331,9 @@ GNUNET_FS_GTK_get_current_search_tab ()
 
 /* ***************** Search event handling ****************** */
 
-/** 
+/**
  * Load an animation.
- * 
+ *
  * @param basename basename of the animation file to load
  * @return handle to the animation.
  */
@@ -371,7 +371,7 @@ clear_metadata_display ()
  * This should get the default download directory (so that GNUnet
  * won't offer the user to download files to the 'bin' subdirectory,
  * or whatever is the cwd).  Returns NULL on failure (such as
- * non-existing directory).  
+ * non-existing directory).
  * TODO: Should also preserve the last setting (so
  * if the user saves files somewhere else, next time we default to
  * somewhere else, at least until application restart, or maybe even
@@ -379,10 +379,10 @@ clear_metadata_display ()
  *
  * Fills the @a buffer up to @a size bytes, returns a pointer to it.
  * Buffer will be NUL-terminated, if not NULL.
- * 
+ *
  * @param buffer where to store the download directory name
  * @param size number of bytes available in @a buffer
- * @return 
+ * @return
  */
 static char *
 get_default_download_directory (char *buffer, size_t size)
@@ -416,9 +416,9 @@ get_default_download_directory (char *buffer, size_t size)
   return buffer;
 }
 
-/** 
- * 
- * 
+/**
+ *
+ *
  * @param tm which tree model are we inspecting
  * @param iter location in the tree model we are getting data from
  * @param finished_chain non-NULL for top-level call (for the item we're about to download), NULL otherwise
@@ -430,7 +430,7 @@ get_default_download_directory (char *buffer, size_t size)
  * @param relative_directory name of the directory in which we're about to download a file, relative to the root_directory. Whether it includes name of the file itself, depends on finished_chain;
  *    Returned strings should be freed with GNUNET_free() if not NULL.
  * @param anonymity anonymity level of one of the *parents. Initialize to -1. If none were downloaded, remains -1.
- */ 
+ */
 static void
 build_relative_name (GtkTreeModel *tm,
                      GtkTreeIter *iter,
@@ -444,7 +444,7 @@ build_relative_name (GtkTreeModel *tm,
   GtkTreeIter parent;
 
   gtk_tree_model_get (tm, iter,
-                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, &filename, 
+                      SEARCH_TAB_MC_DOWNLOADED_FILENAME, &filename,
                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity,
                       -1);
 
@@ -563,7 +563,7 @@ build_relative_name (GtkTreeModel *tm,
  */
 static char *
 get_suggested_filename_anonymity2 (GtkTreeModel *tm,
-                                   GtkTreeIter *iter, 
+                                   GtkTreeIter *iter,
                                    char **download_directory,
                                    int *anonymity)
 {
@@ -581,9 +581,9 @@ get_suggested_filename_anonymity2 (GtkTreeModel *tm,
   relname = NULL;
   finished_chain = GNUNET_NO;
   build_relative_name (tm, iter, &finished_chain, &downloaddir, &relname, &downloaded_anonymity);
-  
-  gtk_tree_model_get (tm, iter, 
-                      SEARCH_TAB_MC_METADATA, &meta, 
+
+  gtk_tree_model_get (tm, iter,
+                      SEARCH_TAB_MC_METADATA, &meta,
                       -1);
 
   filename = GNUNET_FS_meta_data_suggest_filename (meta);
@@ -648,7 +648,7 @@ struct SearchListPopupContext
    * Tab where the search list popup was created.
    */
   struct SearchTab *tab;
-                  
+                
   /**
    * Row where the search list popup was created.
    */
@@ -658,7 +658,7 @@ struct SearchListPopupContext
    * Search result at the respective row.
    */
   struct SearchResult *sr;
- 
+
 };
 
 
@@ -666,7 +666,7 @@ struct SearchListPopupContext
  * An item was selected from the context menu; destroy the menu shell.
  *
  * @param menushell menu to destroy
- * @param user_data the 'struct SearchListPopupContext' of the menu 
+ * @param user_data the 'struct SearchListPopupContext' of the menu
  */
 static void
 search_list_popup_selection_done (GtkMenuShell *menushell,
@@ -688,7 +688,7 @@ search_list_popup_selection_done (GtkMenuShell *menushell,
  * @param user_data the 'struct SearchTab' that contains the tree view
  */
 void
-GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv, 
+GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
                                               gpointer user_data);
 
 
@@ -853,7 +853,7 @@ GNUNET_GTK_search_frame_download_download_button_clicked_cb (GtkButton *button,
  * @param user_data the main window context
  */
 void
-GNUNET_GTK_search_frame_download_filename_change_button_clicked_cb (GtkButton *button, 
+GNUNET_GTK_search_frame_download_filename_change_button_clicked_cb (GtkButton *button,
                                                                     gpointer user_data)
 {
   start_download2 (GNUNET_YES, GNUNET_NO);
@@ -862,9 +862,9 @@ GNUNET_GTK_search_frame_download_filename_change_button_clicked_cb (GtkButton *b
 
 /**
  * "Download" was selected in the current search context menu.
- * 
+ *
  * @param item the 'download' menu item
- * @param user_data the `struct SearchListPopupContext` of the menu 
+ * @param user_data the `struct SearchListPopupContext` of the menu
  */
 static void
 start_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
@@ -904,9 +904,9 @@ handle_uri_from_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 /**
  * "Download recursively" was selected in the current search context menu.
- * 
+ *
  * @param item the 'download recursively' menu item
- * @param user_data the 'struct SearchListPopupContext' of the menu 
+ * @param user_data the 'struct SearchListPopupContext' of the menu
  */
 static void
 start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
@@ -919,9 +919,9 @@ start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 /**
  * "Download as..." was selected in the current search context menu.
- * 
+ *
  * @param item the 'download as...' menu item
- * @param user_data the 'struct SearchListPopupContext' of the menu 
+ * @param user_data the 'struct SearchListPopupContext' of the menu
  */
 static void
 download_as_ctx_menu (GtkMenuItem *item, gpointer user_data)
@@ -933,7 +933,7 @@ download_as_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 /**
  * Download "abort" was selected in the current search context menu.
- * 
+ *
  * @param item the 'abort' menu item
  * @param user_data the 'struct SearchListPopupContext' with the download to abort.
  */
@@ -953,7 +953,7 @@ abort_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 /**
  * Copy current URI to clipboard was selected in the current context menu.
- * 
+ *
  * @param item the 'copy-to-clipboard' menu item
  * @param user_data the `struct SearchListPopupContext` of the menu
  */
@@ -981,7 +981,7 @@ copy_search_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
     return;
   }
   gtk_tree_model_get (tm, &iter,
-                      SEARCH_TAB_MC_URI, &uri, 
+                      SEARCH_TAB_MC_URI, &uri,
                       -1);
   gtk_tree_path_free (path);
   if (uri == NULL)
@@ -998,11 +998,11 @@ copy_search_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 
 /**
- * Callback invoked for each embedded URIs. 
+ * Callback invoked for each embedded URIs.
  *
  * @return 0 to continue iteration, 1 to abort
  */
-typedef int (*EmbeddedUriCallback) (void *cls, 
+typedef int (*EmbeddedUriCallback) (void *cls,
                                     const struct GNUNET_FS_Uri *uri);
 
 
@@ -1038,8 +1038,8 @@ struct UriScannerCallbackContext
  *         whatever the callback returned
  */
 static int
-check_for_embedded_uri (void *cls, 
-                        const char *plugin_name, 
+check_for_embedded_uri (void *cls,
+                        const char *plugin_name,
                         enum EXTRACTOR_MetaType type,
                         enum EXTRACTOR_MetaFormat format,
                         const char *data_mime_type,
@@ -1056,7 +1056,7 @@ check_for_embedded_uri (void *cls,
       (0 != strcmp ("text/plain", data_mime_type)) ||
       (0 == data_size) ||
       ('\0' != data[data_size - 1]) )
-    return 0; 
+    return 0;
   emsg = NULL;
   uri = GNUNET_FS_uri_parse (data, &emsg);
   if (NULL == uri)
@@ -1076,21 +1076,21 @@ check_for_embedded_uri (void *cls,
 
 
 /**
- * Search metadata for URIs, invoke the callback for each one.  
- * 
+ * Search metadata for URIs, invoke the callback for each one.
+ *
  * @param meta meta data to inspect
  * @param cb function to call on URIs that were found
  * @param cls closure for @a cb
  */
 static void
-find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta, 
+find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta,
                     EmbeddedUriCallback cb, void *cls)
 {
   struct UriScannerCallbackContext ctx;
 
   ctx.cb = cb;
   ctx.cls = cls;
-  GNUNET_CONTAINER_meta_data_iterate (meta, 
+  GNUNET_CONTAINER_meta_data_iterate (meta,
                                       &check_for_embedded_uri, &ctx);
 }
 
@@ -1116,7 +1116,7 @@ struct UriPopulationContext
 /**
  * Called for every URI in metadata. Adds up to 3 menu items
  * that will initiate downloads for these URIs
- * 
+ *
  * @param cls the `struct UriPopulationContext`
  * @param uri URI to download
  * @return 0 if we might add more iterms,
@@ -1134,27 +1134,27 @@ populate_popup_with_uri_items (void *cls,
 
   ctx->counter++;
   uris = GNUNET_FS_uri_to_string (uri);
-  GNUNET_asprintf (&label, 
-                   _("URI #%d: %s"),               
+  GNUNET_asprintf (&label,
+                   _("URI #%d: %s"),            
                    ctx->counter,
                    uris);
   GNUNET_free (uris);
   child = gtk_image_menu_item_new_with_label (label);
   GNUNET_free (label);
 
-  ns_association_icon = gtk_image_new_from_icon_name ("gnunet-fs-gtk-ns-association", 
+  ns_association_icon = gtk_image_new_from_icon_name ("gnunet-fs-gtk-ns-association",
                                                       GTK_ICON_SIZE_MENU);
 
   /* Takes ownership of the icon */
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (child), 
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (child),
                                  ns_association_icon);
 
-  g_object_set_data_full (G_OBJECT (child), 
-                          "fs-uri", 
-                          GNUNET_FS_uri_dup (uri), 
+  g_object_set_data_full (G_OBJECT (child),
+                          "fs-uri",
+                          GNUNET_FS_uri_dup (uri),
                           (GDestroyNotify) &GNUNET_FS_uri_destroy);
   g_signal_connect (child, "activate",
-                    G_CALLBACK (handle_uri_from_ctx_menu), 
+                    G_CALLBACK (handle_uri_from_ctx_menu),
                     NULL);
   gtk_widget_show (child);
   gtk_menu_shell_append (GTK_MENU_SHELL (ctx->menu), child);
@@ -1177,8 +1177,8 @@ populate_popup_with_uri_items (void *cls,
  *         TRUE if there is now a pop-up menu
  */
 static gboolean
-search_list_popup (GtkTreeModel *tm, 
-                   struct SearchTab *tab, 
+search_list_popup (GtkTreeModel *tm,
+                   struct SearchTab *tab,
                    gint init_button,
                    guint32 event_time,
                    GtkTreeIter *iter)
@@ -1251,8 +1251,8 @@ search_list_popup (GtkTreeModel *tm,
 
   /* check for embedded URIs */
   uri_pop_ctx.counter = 0;
-  uri_pop_ctx.menu = menu;  
-  find_embedded_uris (meta, 
+  uri_pop_ctx.menu = menu;
+  find_embedded_uris (meta,
                       &populate_popup_with_uri_items,
                       &uri_pop_ctx);
   if (0 < uri_pop_ctx.counter)
@@ -1301,7 +1301,7 @@ search_list_popup (GtkTreeModel *tm,
  *         TRUE if there is now a pop-up menu
  */
 gboolean
-GNUNET_FS_GTK_search_treeview_popup_menu (GtkWidget *widget, 
+GNUNET_FS_GTK_search_treeview_popup_menu (GtkWidget *widget,
                                           gpointer user_data)
 {
   GtkTreeView *tv = GTK_TREE_VIEW (widget);
@@ -1328,7 +1328,7 @@ GNUNET_FS_GTK_search_treeview_popup_menu (GtkWidget *widget,
  *         TRUE to stop the propagation
  */
 gboolean
-GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget, 
+GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget,
                                                   GdkEvent * event,
                                                   gpointer user_data)
 {
@@ -1345,12 +1345,12 @@ GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget,
   if (! gtk_tree_view_get_path_at_pos (tv,
                                        event_button->x, event_button->y,
                                        &path, NULL, NULL, NULL))
-    return FALSE; /* click outside of area with values, ignore */    
+    return FALSE; /* click outside of area with values, ignore */
   tm = gtk_tree_view_get_model (tv);
   if (! gtk_tree_model_get_iter (tm, &iter, path))
-    return FALSE; /* not sure how we got a path but no iter... */  
+    return FALSE; /* not sure how we got a path but no iter... */
   gtk_tree_path_free (path);
-  search_list_popup (tm, tab, 
+  search_list_popup (tm, tab,
                      event_button->button,
                      event_button->time,
                      &iter);
@@ -1444,7 +1444,7 @@ close_search_tab (struct SearchTab *tab)
 
 /**
  * Close the 'uri_tab'.
- */ 
+ */
 void
 GNUNET_FS_GTK_close_uri_tab_ ()
 {
@@ -1463,7 +1463,7 @@ GNUNET_FS_GTK_close_uri_tab_ ()
  * to refer to the new model.
  *
  * @param src_model source model
- * @param src_iter parent of the nodes to move 
+ * @param src_iter parent of the nodes to move
  * @param dst_tab destination tab
  * @param dst_iter new parent of the entries we are moving
  */
@@ -1610,10 +1610,10 @@ download_lost_parent (struct DownloadEntry *de)
     return;
   }
   gtk_tree_path_free (path);
-  gtk_tree_model_get (tm_old, &iter_old, 
+  gtk_tree_model_get (tm_old, &iter_old,
                       SEARCH_TAB_MC_METADATA, &meta,
                       SEARCH_TAB_MC_URI, &uri,
-                      SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress, 
+                      SEARCH_TAB_MC_PERCENT_PROGRESS, &percent_progress,
                       SEARCH_TAB_MC_PERCENT_AVAILABILITY, &percent_availability,
                       SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, &unknown_availability,
                       SEARCH_TAB_MC_FILENAME, &filename,
@@ -1700,9 +1700,9 @@ move_downloads_in_subtree (GtkTreeModel *tm,
       gtk_tree_model_get (tm, &child,
                           SEARCH_TAB_MC_METADATA, &meta,
                           SEARCH_TAB_MC_URI, &uri,
-                          SEARCH_TAB_MC_SEARCH_RESULT, &sr, 
+                          SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                           -1);
-      if (NULL != sr->download) 
+      if (NULL != sr->download)
       {
         if (sr->download->is_done == GNUNET_YES)
         {
@@ -1731,7 +1731,7 @@ move_downloads_in_subtree (GtkTreeModel *tm,
                           SEARCH_TAB_MC_SEARCH_RESULT, NULL,
                           -1);
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &child));    
+    while (TRUE == gtk_tree_model_iter_next (tm, &child));
   }
 }
 
@@ -1754,7 +1754,7 @@ free_search_result (struct SearchResult *sr)
   struct GNUNET_CONTAINER_MetaData *meta;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Freeing a search result SR=%p\n", 
+              "Freeing a search result SR=%p\n",
               sr);
   if ( (NULL == sr) ||
        (NULL == sr->rr) ||
@@ -1796,7 +1796,7 @@ free_search_result (struct SearchResult *sr)
  * @param user_data the 'struct SearchTab' that contains the tree view
  */
 void
-GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv, 
+GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
                                               gpointer user_data)
 {
   struct SearchTab *tab = user_data;
@@ -1861,7 +1861,7 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
 
       gtk_entry_set_text (mctx->download_name_entry, filename != NULL ? filename : NULL);
       gtk_file_chooser_set_current_folder (mctx->download_location_chooser, download_directory);
-    
+
       gtk_widget_show_all (GTK_WIDGET (mctx->download_panel));
       GNUNET_free_non_null (filename);
       GNUNET_free (download_directory);
@@ -1922,7 +1922,7 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
     return;
   }
   gtk_widget_hide (GTK_WIDGET (mctx->download_panel));
-  /* active tab is not a search tab (likely the 'publish' tab), 
+  /* active tab is not a search tab (likely the 'publish' tab),
      clear meta data and preview widgets */
   gtk_image_clear (mctx->preview_image);
   gtk_list_store_clear (mctx->md_liststore);
@@ -1995,7 +1995,7 @@ GNUNET_FS_GTK_search_result_play_button_clicked (GtkButton * button, gpointer us
   }
   GNUNET_FS_search_continue (tab->sc);
   gtk_widget_show (tab->pause_button);
-  gtk_widget_hide (tab->play_button); 
+  gtk_widget_hide (tab->play_button);
 }
 
 
@@ -2036,7 +2036,7 @@ stop_downloads_in_subtree (GtkTreeModel *tm,
       if (GNUNET_YES != stop_downloads_in_subtree (tm, &child))
         ret = GNUNET_NO;
     }
-    while (TRUE == gtk_tree_model_iter_next (tm, &child));    
+    while (TRUE == gtk_tree_model_iter_next (tm, &child));
   }
   return ret;
 }
@@ -2065,7 +2065,7 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
   if (! gtk_tree_model_get_iter_first (tm, &iter))
     return;
   do
-  {    
+  {
     gtk_tree_model_get (tm, &iter,
                         SEARCH_TAB_MC_SEARCH_RESULT, &sr,
                         -1);
@@ -2080,7 +2080,7 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
          (GNUNET_YES == stop_downloads_in_subtree (tm, &iter)) )
     {
       /* no active download and no associated FS-API search result;
-         so this must be some left-over entry from an opened 
+         so this must be some left-over entry from an opened
          directory; clean it up */
       free_search_result (sr);
       /* the above call clobbered our 'iter', restart from the beginning... */
@@ -2100,7 +2100,7 @@ GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer u
  * @param emsg the error message
  */
 static void
-handle_search_error (struct SearchTab *tab, 
+handle_search_error (struct SearchTab *tab,
                      const char *emsg)
 {
   gtk_label_set_text (tab->label, _("Error!"));
@@ -2183,7 +2183,7 @@ update_search_result (struct SearchResult *sr,
     percent_avail = 50 + (gint) (availability_rank * 50.0 / availability_certainty);
   else
     percent_avail = 50;
-  gtk_tree_store_set (ts, &iter, 
+  gtk_tree_store_set (ts, &iter,
                       SEARCH_TAB_MC_METADATA, GNUNET_CONTAINER_meta_data_duplicate (meta),
                       SEARCH_TAB_MC_PREVIEW, pixbuf,
                       SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) percent_avail,
@@ -2219,9 +2219,9 @@ update_search_result (struct SearchResult *sr,
 }
 
 
-/** 
+/**
  * If called, sets the `gboolean` pointer in @a cls to TRUE.
- * 
+ *
  * @param cls pointer to a `gboolean`
  * @param sks_uri a URI
  * @return 1 (abort iteration)
@@ -2238,14 +2238,14 @@ see_if_there_are_any_uris (void *cls,
 
 
 /**
- * Add a search result to the given search tab.  This function is called 
+ * Add a search result to the given search tab.  This function is called
  * not only for 'normal' search results but also for directories that
  * are being opened and if the user manually enters a URI.
  *
- * @param tab search tab to extend, never NULL 
+ * @param tab search tab to extend, never NULL
  * @param anonymity anonymity level to use for probes for this result
  * @param parent_rr reference to parent entry in search tab, NULL for normal
- *                  search results, 
+ *                  search results,
  * @param uri uri to add, can be NULL for top-level entry of a directory opened from disk
  *                        (in this case, we don't know the URI and should probably not
  *                         bother to calculate it)
@@ -2257,7 +2257,7 @@ see_if_there_are_any_uris (void *cls,
  *                model at 'iter')
  */
 struct SearchResult *
-GNUNET_GTK_add_search_result (struct SearchTab *tab, 
+GNUNET_GTK_add_search_result (struct SearchTab *tab,
                               uint32_t anonymity,
                               GtkTreeRowReference *parent_rr,
                               const struct GNUNET_FS_Uri *uri,
@@ -2303,14 +2303,14 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
     else
     {
       fsize = 0;
-      mime = GNUNET_strdup ("gnunet/namespace"); 
+      mime = GNUNET_strdup ("gnunet/namespace");
       status_colour = "lightgreen";
     }
     uris = GNUNET_FS_uri_to_string (uri);
   }
   desc = GNUNET_FS_GTK_get_description_from_metadata (meta, &desc_is_a_dup);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
-  find_embedded_uris (meta, 
+  find_embedded_uris (meta,
                       &see_if_there_are_any_uris,
                       &show_uri_association);
 
@@ -2352,7 +2352,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   }
   gtk_tree_store_insert_with_values (ts, &iter, pitr, G_MAXINT,
                                      SEARCH_TAB_MC_METADATA, GNUNET_CONTAINER_meta_data_duplicate (meta),
-                                     SEARCH_TAB_MC_URI, (uri == NULL) ? NULL : GNUNET_FS_uri_dup (uri), 
+                                     SEARCH_TAB_MC_URI, (uri == NULL) ? NULL : GNUNET_FS_uri_dup (uri),
                                      SEARCH_TAB_MC_FILESIZE, fsize,
                                      SEARCH_TAB_MC_PREVIEW, pixbuf,
                                      SEARCH_TAB_MC_PERCENT_PROGRESS, 0,
@@ -2387,7 +2387,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
   while (NULL != tab->parent)
     tab = tab->parent->tab;
   tab->num_results++;
-  
+
   return sr;
 }
 
@@ -2427,7 +2427,7 @@ GNUNET_FS_GTK_set_item_downloaded_name (GtkTreeStore *ts, GtkTreeRowReference *r
       char *suggested_filename;
       int anonymity = -1;
 
-      gtk_tree_store_set (ts, &iter, 
+      gtk_tree_store_set (ts, &iter,
                           SEARCH_TAB_MC_DOWNLOADED_FILENAME, filename,
                            -1);
 
@@ -2492,7 +2492,7 @@ GNUNET_FS_GTK_set_item_downloaded_name (GtkTreeStore *ts, GtkTreeRowReference *r
  *                model at 'iter')
  */
 static struct SearchResult *
-process_search_result (struct SearchTab *tab, 
+process_search_result (struct SearchTab *tab,
                        uint32_t anonymity,
                        struct SearchResult *parent,
                        const struct GNUNET_FS_Uri *uri,
@@ -2696,18 +2696,18 @@ GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
 /**
  * Change the (background) color of the given download entry.
  *
- * @param de entry to change 
+ * @param de entry to change
  * @param color name of the color to use
  */
 static void
-change_download_color (struct DownloadEntry *de, 
+change_download_color (struct DownloadEntry *de,
                         const char *color)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Changing download DE=%p color to %s\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Changing download DE=%p color to %s\n",
               de, color);
   path = gtk_tree_row_reference_get_path (de->sr->rr);
   if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
@@ -2786,7 +2786,7 @@ struct AddDirectoryEntryContext
    * Anonymity level to use for probes in this directory.
    */
   uint32_t anonymity;
-  
+
   /**
    * Do we need to check if the given entry already exists to
    * avoid adding it twice?  Set to #GNUNET_YES if #add_directory_entry
@@ -2835,8 +2835,8 @@ add_directory_entry (void *cls, const char *filename,
   GtkTreeModel *tm;
   struct GNUNET_FS_Uri *xuri;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Adding directory entry `%s'\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Adding directory entry `%s'\n",
               filename);
   if (NULL == uri)
   {
@@ -2849,7 +2849,7 @@ add_directory_entry (void *cls, const char *filename,
   {
     tm = gtk_tree_row_reference_get_model (ade->prr);
     path = gtk_tree_row_reference_get_path (ade->prr);
-    if (! gtk_tree_model_get_iter (tm, &piter, path)) 
+    if (! gtk_tree_model_get_iter (tm, &piter, path))
     {
       GNUNET_break (0);
       gtk_tree_path_free (path);
@@ -2860,8 +2860,8 @@ add_directory_entry (void *cls, const char *filename,
     {
       do
       {
-        gtk_tree_model_get (tm, &iter, 
-                            SEARCH_TAB_MC_URI, &xuri, 
+        gtk_tree_model_get (tm, &iter,
+                            SEARCH_TAB_MC_URI, &xuri,
                             -1);
         if (GNUNET_YES == GNUNET_FS_uri_test_equal (xuri, uri))
           return;               /* already present */
@@ -2869,9 +2869,9 @@ add_directory_entry (void *cls, const char *filename,
       while (TRUE == gtk_tree_model_iter_next (tm, &iter));
     }
   }
-  GNUNET_GTK_add_search_result (ade->tab, 
+  GNUNET_GTK_add_search_result (ade->tab,
                                 ade->anonymity,
-                                ade->prr, 
+                                ade->prr,
                                 uri, meta, NULL,
                                 0);
 }
@@ -2892,7 +2892,7 @@ add_directory_entry (void *cls, const char *filename,
  * @param depth depth of the block in the ECRS tree
  */
 static void
-mark_download_progress (struct DownloadEntry *de, 
+mark_download_progress (struct DownloadEntry *de,
                         const char *filename,
                         uint64_t size,
                         uint64_t completed, const void *block_data,
@@ -2931,19 +2931,19 @@ mark_download_progress (struct DownloadEntry *de,
     {
       /* got a data block of a directory, list its contents */
       struct AddDirectoryEntryContext ade;
-      
+
       ade.tab = de->sr->tab;
       ade.prr = de->sr->rr;
       ade.check_duplicates = GNUNET_NO;
-      ade.anonymity = de->anonymity; 
+      ade.anonymity = de->anonymity;
       if (GNUNET_SYSERR ==
           GNUNET_FS_directory_list_contents ((size_t) block_size, block_data,
                                              offset, &add_directory_entry, &ade))
       {
         /* Mime type was wrong, this is not a directory, update model! */
         de->is_directory = GNUNET_SYSERR;
-        gtk_tree_store_set (de->sr->tab->ts, &iter, 
-                            SEARCH_TAB_MC_MIMETYPE, "", 
+        gtk_tree_store_set (de->sr->tab->ts, &iter,
+                            SEARCH_TAB_MC_MIMETYPE, "",
                             -1);
       }
     }
@@ -2955,7 +2955,7 @@ mark_download_progress (struct DownloadEntry *de,
          (filename != NULL) )
     {
       struct AddDirectoryEntryContext ade;
-  
+
       /* download was for a directory (and we have a temp file for scanning);
          add contents of the directory to the view */
       ade.tab = de->sr->tab;
@@ -3026,7 +3026,7 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size)
     return;
   }
   gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter, 
+  gtk_tree_store_set (de->sr->tab->ts, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) 100,
                       SEARCH_TAB_MC_PERCENT_AVAILABILITY, (guint) 100,
                       SEARCH_TAB_MC_UNKNOWN_AVAILABILITY, -1,
@@ -3052,7 +3052,7 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size)
  */
 static struct DownloadEntry *
 setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
-                struct SearchResult *sr, 
+                struct SearchResult *sr,
                 uint32_t anonymity,
                 struct GNUNET_FS_DownloadContext *dc,
                 const struct GNUNET_FS_Uri *uri, const char *filename,
@@ -3078,7 +3078,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   }
   de->dc = dc;
   de->pde = pde;
-  if (NULL != sr) 
+  if (NULL != sr)
   {
     /* have a search result, establish mapping de <--> sr */
     if (NULL == de->sr)
@@ -3086,7 +3086,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
       GNUNET_assert (sr->download == NULL);
       de->sr = sr;
       sr->download = de;
-    } 
+    }
     else
     {
       GNUNET_assert (sr == de->sr);
@@ -3101,7 +3101,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     GtkTreeIter iter;
     GtkTreeIter child;
     struct GNUNET_FS_Uri *uri;
-    
+
     tm = GTK_TREE_MODEL (pde->sr->tab->ts);
     path = gtk_tree_row_reference_get_path (pde->sr->rr);
     if ( (! gtk_tree_model_get_iter (tm, &iter, path)) ||
@@ -3121,7 +3121,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                                                     uri))       
           break;
         de->sr = NULL;
-      } 
+      }
       while (gtk_tree_model_iter_next (tm, &child));
       if (NULL == de->sr)
       {
@@ -3154,7 +3154,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   else
   {
     struct GNUNET_CONTAINER_MetaData *meta;
-                             
+
    /* get metadata from existing tab, might have a mime type */
     path = gtk_tree_row_reference_get_path (de->sr->rr);
     if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (de->sr->tab->ts), &iter, path))
@@ -3169,11 +3169,11 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     de->is_directory = GNUNET_FS_meta_data_test_for_directory (meta);
   }
   gtk_tree_path_free (path);
-  gtk_tree_store_set (de->sr->tab->ts, &iter, 
+  gtk_tree_store_set (de->sr->tab->ts, &iter,
                       SEARCH_TAB_MC_PERCENT_PROGRESS, (guint) ((size > 0) ? (100 * completed / size) : 100),
                       SEARCH_TAB_MC_FILENAME, filename,
                       SEARCH_TAB_MC_STATUS_COLOUR, "blue",
-                      SEARCH_TAB_MC_SEARCH_RESULT, de->sr, 
+                      SEARCH_TAB_MC_SEARCH_RESULT, de->sr,
                       SEARCH_TAB_MC_COMPLETED, (guint64) completed,
                       SEARCH_TAB_MC_DOWNLOADED_FILENAME, de->filename,
                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
@@ -3191,7 +3191,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
 /**
  * Change the (background) color of the given publish entry.
  *
- * @param pe entry to change 
+ * @param pe entry to change
  * @param color name of the color to use
  */
 static void
@@ -3201,8 +3201,8 @@ change_publish_color (struct PublishEntry *pe,
   GtkTreeIter iter;
   GtkTreePath *path;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "Changing publish PE=%p color to %s\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Changing publish PE=%p color to %s\n",
               pe, color);
   path = gtk_tree_row_reference_get_path (pe->rr);
   if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (pe->tab->ts), &iter, path))
@@ -3212,8 +3212,8 @@ change_publish_color (struct PublishEntry *pe,
     return;
   }
   gtk_tree_path_free (path);
-  gtk_tree_store_set (pe->tab->ts, &iter, 
-                      PUBLISH_TAB_MC_BGCOLOUR, color, 
+  gtk_tree_store_set (pe->tab->ts, &iter,
+                      PUBLISH_TAB_MC_BGCOLOUR, color,
                       -1);
 }
 
@@ -3272,7 +3272,7 @@ handle_publish_completed (struct PublishEntry *pe,
   gtk_tree_path_free (path);
   pe->uri = GNUNET_FS_uri_dup (uri);
   uris = GNUNET_FS_uri_to_string (uri);
-  gtk_tree_store_set (pe->tab->ts, &iter, 
+  gtk_tree_store_set (pe->tab->ts, &iter,
                       PUBLISH_TAB_MC_RESULT_STRING, uris,
                       PUBLISH_TAB_MC_PROGRESS, 100,
                       PUBLISH_TAB_MC_STATUS_ICON, GNUNET_GTK_animation_context_get_pixbuf (animation_published),
@@ -3286,7 +3286,7 @@ handle_publish_completed (struct PublishEntry *pe,
  * We received a publish error message from the FS library.
  * Present it to the user in an appropriate form.
  *
- * @param pe publishing operation affected by the error 
+ * @param pe publishing operation affected by the error
  * @param emsg the error message
  */
 static void
@@ -3306,7 +3306,7 @@ handle_publish_error (struct PublishEntry *pe,
   gtk_tree_path_free (path);
   if (NULL == animation_error)
     animation_error = load_animation ("error");
-  gtk_tree_store_set (pe->tab->ts, &iter, 
+  gtk_tree_store_set (pe->tab->ts, &iter,
                       PUBLISH_TAB_MC_RESULT_STRING, emsg,
                       PUBLISH_TAB_MC_PROGRESS, 100,
                       PUBLISH_TAB_MC_STATUS_ICON, GNUNET_GTK_animation_context_get_pixbuf (animation_error),
@@ -3316,7 +3316,7 @@ handle_publish_error (struct PublishEntry *pe,
 
 
 /**
- * Remove publish tab from notebook 
+ * Remove publish tab from notebook
  */
 static void
 delete_publish_tab ()
@@ -3325,7 +3325,7 @@ delete_publish_tab ()
   int index;
   int i;
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
- 
+
   if (NULL == publish_tab)
     return;
   pt = publish_tab;
@@ -3391,7 +3391,7 @@ handle_publish_stop (struct PublishEntry *pe)
  * @param user_data the 'struct PublishTab' that is being closed
  */
 void
-GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button, 
+GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button,
                                                   gpointer user_data)
 {
   struct PublishTab *tab = user_data;
@@ -3404,8 +3404,8 @@ GNUNET_FS_GTK_publish_label_close_button_clicked (GtkButton * button,
   tm = GTK_TREE_MODEL (publish_tab->ts);
   while (gtk_tree_model_iter_children (tm, &iter, NULL))
   {
-    gtk_tree_model_get (tm, &iter, 
-                        PUBLISH_TAB_MC_ENT, &pe, 
+    gtk_tree_model_get (tm, &iter,
+                        PUBLISH_TAB_MC_ENT, &pe,
                         -1);
     GNUNET_FS_publish_stop (pe->pc);
   }
@@ -3439,7 +3439,7 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
   GtkTreeView *tv;
   GtkTreeViewColumn *anim_col;
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
-  
+
   if (NULL == publish_tab)
   {
     /* create new tab */
@@ -3453,7 +3453,7 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
     g_object_ref (publish_tab->frame);
     gtk_container_remove (GTK_CONTAINER (df), publish_tab->frame);
     gtk_widget_destroy (GTK_WIDGET (df));
-    
+
     /* load tab_label */
     df = GTK_WINDOW (gtk_builder_get_object
                      (publish_tab->builder, "_publish_label_window"));
@@ -3534,7 +3534,7 @@ struct PublishListPopupContext
    * Tab where the publish list popup was created.
    */
   struct PublishTab *tab;
-                  
+                
   /**
    * Row where the publish list popup was created.
    */
@@ -3545,7 +3545,7 @@ struct PublishListPopupContext
    * Publishing entry at the respective row.
    */
   struct PublishEntry *pe;
- 
+
 };
 
 
@@ -3553,7 +3553,7 @@ struct PublishListPopupContext
  * An item was selected from the context menu; destroy the menu shell.
  *
  * @param menushell menu to destroy
- * @param user_data the 'struct PublishListPopupContext' of the menu 
+ * @param user_data the 'struct PublishListPopupContext' of the menu
  */
 static void
 publish_list_popup_selection_done (GtkMenuShell *menushell,
@@ -3569,7 +3569,7 @@ publish_list_popup_selection_done (GtkMenuShell *menushell,
 
 /**
  * Publish "abort" was selected in the current publish context menu.
- * 
+ *
  * @param item the 'abort' menu item
  * @param user_data the 'struct PublishListPopupContext' with the operation to abort.
  */
@@ -3578,7 +3578,7 @@ abort_publish_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
   struct PublishListPopupContext *ppc = user_data;
   struct PublishEntry *pe = ppc->pe;
-  
+
   if (NULL != pe->pc)
     GNUNET_FS_publish_stop (pe->pc);
 }
@@ -3586,7 +3586,7 @@ abort_publish_ctx_menu (GtkMenuItem *item, gpointer user_data)
 
 /**
  * Copy current URI to clipboard was selected in the current context menu.
- * 
+ *
  * @param item the 'copy-to-clipboard' menu item
  * @param user_data the 'struct DownloadListPopupContext' of the menu
  */
@@ -3626,8 +3626,8 @@ copy_publish_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
  *         TRUE if there is now a pop-up menu
  */
 static gboolean
-publish_list_popup (GtkTreeModel *tm, 
-                    struct PublishTab *tab, 
+publish_list_popup (GtkTreeModel *tm,
+                    struct PublishTab *tab,
                     gint init_button,
                     guint32 event_time,
                     GtkTreeIter *iter)
@@ -3638,8 +3638,8 @@ publish_list_popup (GtkTreeModel *tm,
   struct PublishEntry *pe;
   struct PublishListPopupContext *ppc;
 
-  gtk_tree_model_get (tm, iter, 
-                      PUBLISH_TAB_MC_ENT, &pe, 
+  gtk_tree_model_get (tm, iter,
+                      PUBLISH_TAB_MC_ENT, &pe,
                       -1);
   if ( (NULL == pe->uri) &&
        ( (NULL == pe->pc) ||
@@ -3676,7 +3676,7 @@ publish_list_popup (GtkTreeModel *tm,
                                  TRUE);
     gtk_widget_show (child);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
-  } 
+  }
   g_signal_connect (menu, "selection-done",
                     G_CALLBACK (publish_list_popup_selection_done), ppc);
   gtk_menu_popup (menu, NULL, NULL, NULL, NULL, init_button, event_time);
@@ -3693,7 +3693,7 @@ publish_list_popup (GtkTreeModel *tm,
  *         TRUE if there is now a pop-up menu
  */
 gboolean
-GNUNET_FS_GTK_publish_treeview_popup_menu (GtkWidget *widget, 
+GNUNET_FS_GTK_publish_treeview_popup_menu (GtkWidget *widget,
                                            gpointer user_data)
 {
   GtkTreeView *tv = GTK_TREE_VIEW (widget);
@@ -3720,7 +3720,7 @@ GNUNET_FS_GTK_publish_treeview_popup_menu (GtkWidget *widget,
  *         TRUE to stop the event propagation.
  */
 gboolean
-GNUNET_FS_GTK_publish_treeview_button_press_event (GtkWidget * widget, 
+GNUNET_FS_GTK_publish_treeview_button_press_event (GtkWidget * widget,
                                                    GdkEvent * event,
                                                    gpointer user_data)
 {
@@ -3737,12 +3737,12 @@ GNUNET_FS_GTK_publish_treeview_button_press_event (GtkWidget * widget,
   if (! gtk_tree_view_get_path_at_pos (tv,
                                        event_button->x, event_button->y,
                                        &path, NULL, NULL, NULL))
-    return FALSE; /* click outside of area with values, ignore */    
+    return FALSE; /* click outside of area with values, ignore */
   tm = gtk_tree_view_get_model (tv);
   if (! gtk_tree_model_get_iter (tm, &iter, path))
-    return FALSE; /* not sure how we got a path but no iter... */  
+    return FALSE; /* not sure how we got a path but no iter... */
   gtk_tree_path_free (path);
-  publish_list_popup (tm, tab, 
+  publish_list_popup (tm, tab,
                       event_button->button,
                       event_button->time,
                       &iter);
@@ -3775,7 +3775,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
                              const struct GNUNET_FS_ProgressInfo *info)
 {
   void *ret;
-  
+
   GNUNET_FS_GTK_set_fs_handle (info->fsh);
   switch (info->status)
   {
@@ -3820,7 +3820,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
     return NULL;
   case GNUNET_FS_STATUS_DOWNLOAD_START:
     return setup_download (info->value.download.cctx, info->value.download.pctx,
-                           info->value.download.sctx, 
+                           info->value.download.sctx,
                            info->value.download.anonymity,
                            info->value.download.dc,
                            info->value.download.uri,
@@ -3831,7 +3831,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
   case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
     ret =
         setup_download (info->value.download.cctx, info->value.download.pctx,
-                        info->value.download.sctx, 
+                        info->value.download.sctx,
                         info->value.download.anonymity,
                         info->value.download.dc,
                         info->value.download.uri, info->value.download.filename,
@@ -3840,7 +3840,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
                         info->value.download.completed);
     if (NULL != info->value.download.specifics.resume.message)
       mark_download_error (ret,
-                           info->value.download.specifics.resume.message);   
+                           info->value.download.specifics.resume.message);
     return ret;
   case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
     stop_download (info->value.download.cctx);
@@ -3871,12 +3871,12 @@ GNUNET_GTK_fs_event_handler (void *cls,
     return NULL;
   case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
     change_download_color (info->value.download.cctx, "yellow");
-    change_download_status_icon (info->value.download.cctx, 
+    change_download_status_icon (info->value.download.cctx,
                                  GNUNET_GTK_animation_context_get_pixbuf (animation_downloading));
     return info->value.download.cctx;
   case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
     change_download_color (info->value.download.cctx, "blue");
-    change_download_status_icon (info->value.download.cctx, 
+    change_download_status_icon (info->value.download.cctx,
                                  GNUNET_GTK_animation_context_get_pixbuf (animation_download_stalled));
     return info->value.download.cctx;
   case GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT:
@@ -3895,7 +3895,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
     return ret;
   case GNUNET_FS_STATUS_SEARCH_RESUME_RESULT:
     ret =
-        process_search_result (info->value.search.cctx, 
+        process_search_result (info->value.search.cctx,
                                info->value.search.anonymity,
                                info->value.search.pctx,
                                info->value.search.specifics.resume_result.uri,
diff --git a/src/fs/gnunet-fs-gtk_event-handler.h b/src/fs/gnunet-fs-gtk_event-handler.h
index ae7bde2c..e0f5d8ed 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.h
+++ b/src/fs/gnunet-fs-gtk_event-handler.h
@@ -68,7 +68,7 @@ struct SearchTab
 
   /**
    * GtkBuilder object for the search tab.
-   */ 
+   */
   GtkBuilder *builder;
 
   /**
@@ -238,7 +238,7 @@ GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
  * @param tab search tab to extend, never NULL
  * @param anonymity anonymity level to use for probes for this result
  * @param parent_rr reference to parent entry in search tab, NULL for normal
- *                  search results, 
+ *                  search results,
  * @param uri uri to add, can be NULL for top-level entry of a directory opened from disk
  *                        (in this case, we don't know the URI and should probably not
  *                         bother to calculate it)
@@ -250,7 +250,7 @@ GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
  *                model at 'iter')
  */
 struct SearchResult *
-GNUNET_GTK_add_search_result (struct SearchTab *tab, 
+GNUNET_GTK_add_search_result (struct SearchTab *tab,
                               uint32_t anonymity,
                               GtkTreeRowReference *parent_rr,
                               const struct GNUNET_FS_Uri *uri,
@@ -284,7 +284,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
 
 /**
  * Close the 'uri_tab'.
- */ 
+ */
 void
 GNUNET_FS_GTK_close_uri_tab_ ();
 
diff --git a/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c b/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
index 308b2582..9777b892 100644
--- a/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
+++ b/src/fs/gnunet-fs-gtk_main-window-meta-data-context-menu.c
@@ -39,7 +39,7 @@
  * @param path unused
  * @param iter position in the model to access
  * @param user_data 'GList**' where we should store the types and values found
- */ 
+ */
 static void
 copy_metadata_to_clipboard (GtkTreeModel * model, GtkTreePath * path,
                             GtkTreeIter * iter, gpointer user_data)
@@ -66,7 +66,7 @@ copy_metadata_to_clipboard (GtkTreeModel * model, GtkTreePath * path,
  * @param user_data the GtkBuilder of the main window
  */
 void
-GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem, 
+GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem,
                                                  gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
@@ -115,14 +115,14 @@ GNUNET_GTK_FS_metadata_copy_selection_activated (GtkMenuItem * menuitem,
     p = g_stpcpy (p, ": ");
     p = g_stpcpy (p, (gchar *) value->data);
     if (NULL != value->next)
-      p = g_stpcpy (p, "\n");        
+      p = g_stpcpy (p, "\n");
   }
   g_list_foreach (pairs, (GFunc) &g_free, NULL);
   g_list_free (pairs);
   cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (cb, s, -1);
   gtk_clipboard_store (cb);
-  g_free (s);  
+  g_free (s);
 }
 
 
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 45aaf590..11bacee2 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -43,7 +43,7 @@ static void
 search_for_uri (struct GNUNET_FS_Uri *uri,
                 guint anonymity_level)
 {
-  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), 
+  GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (),
                           uri, anonymity_level,
                           GNUNET_FS_SEARCH_OPTION_NONE, NULL);
   GNUNET_FS_uri_destroy (uri);
@@ -74,7 +74,7 @@ abort_search_lookup (struct SearchLookup *sl)
     sl->gns = NULL;
   }
   g_free (sl->keywords);
-  GNUNET_free (sl);                            
+  GNUNET_free (sl);                     
 }
 
 
@@ -92,7 +92,7 @@ timeout_search_lookup (void *cls,
   struct SearchLookup *sl = cls;
 
   sl->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               _("Failed to resolve namespace in time\n"));
   abort_search_lookup (sl);
 }
@@ -128,9 +128,9 @@ handle_gns_result (void *cls,
     uri = GNUNET_FS_uri_sks_create (rd[i].data, sl->keywords);
     search_for_uri (uri, sl->anonymity_level);
     abort_search_lookup (sl);
-    return;      
+    return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               _("Failed to resolve namespace in time\n"));
   abort_search_lookup (sl);
 }
@@ -171,7 +171,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
                                 ("main_window_search_mime_combobox"));
     mime_model = gtk_combo_box_get_model (mime_combo);
     mime_keyword = NULL;
-    if ( (NULL != mime_model) && 
+    if ( (NULL != mime_model) &&
          gtk_combo_box_get_active_iter (mime_combo, &iter))
       gtk_tree_model_get (mime_model, &iter,
                           GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_MIME_MC_MIME,
@@ -186,7 +186,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   }
   {
     GtkComboBox *namespace_box;
-    
+
     namespace_box = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox"));
     nsid = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (namespace_box))));
     if ( (NULL != nsid) &&
@@ -196,16 +196,16 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
                              _("<none>"))) ) )
       nsid = NULL;
   }
-   
+
   /* get keywords and compose keyword string */
   {
     const char *entry_keywords;
 
-    entry_keywords = gtk_entry_get_text (main_ctx->search_entry);  
+    entry_keywords = gtk_entry_get_text (main_ctx->search_entry);
     if (NULL != mime_keyword)
     {
-      keywords = g_strdup_printf ("%s +%s", 
-                                  entry_keywords, 
+      keywords = g_strdup_printf ("%s +%s",
+                                  entry_keywords,
                                   mime_keyword);
       g_free (mime_keyword);
     }
@@ -218,7 +218,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   /* build KSK/SKS URI */
   if ( (NULL != nsid) &&
        (0 < strlen (nsid)) )
-  {    
+  {
     sl = GNUNET_new (struct SearchLookup);
     sl->keywords = keywords;
     sl->anonymity_level = anonymity_level;
@@ -244,13 +244,13 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
   if (NULL == uri)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Invalid keyword string `%s': %s"),
                 keywords, emsg);
     g_free (keywords);
     GNUNET_free_non_null (emsg);
     return;
-  }  
+  }
   g_free (keywords);
   search_for_uri (uri, anonymity_level);
 }
@@ -263,7 +263,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
  * @param user_data the main window context builder
  */
 void
-main_window_search_button_clicked_cb (GtkButton * button, 
+main_window_search_button_clicked_cb (GtkButton * button,
                                       gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
@@ -312,13 +312,13 @@ end_pseu_lookup (void *cls,
   if (NULL != lctx->progress_dialog_builder)
   {
     gtk_widget_destroy (lctx->progress_dialog);
-    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));
     lctx->progress_dialog_builder = NULL;
   }
   if (NULL != lctx->nick_dialog_builder)
   {
     gtk_widget_destroy (lctx->nick_dialog);
-    g_object_unref (G_OBJECT (lctx->nick_dialog_builder));  
+    g_object_unref (G_OBJECT (lctx->nick_dialog_builder));
     lctx->nick_dialog_builder = NULL;
   }
 
@@ -406,11 +406,11 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx,
   lctx->nick = GNUNET_strdup (nick);
   /* again, show progress indicator, this should be fast though... */
   lctx->progress_dialog_builder
-    = GNUNET_GTK_get_new_builder 
-    ("gnunet_fs_gtk_pseu_progress_dialog.glade", 
+    = GNUNET_GTK_get_new_builder
+    ("gnunet_fs_gtk_pseu_progress_dialog.glade",
      lctx);
-  lctx->progress_dialog 
-    = GTK_WIDGET (gtk_builder_get_object 
+  lctx->progress_dialog
+    = GTK_WIDGET (gtk_builder_get_object
                   (lctx->progress_dialog_builder,
                    "GNUNET_FS_GTK_pseu_progress_dialog"));
   /* show the window */
@@ -441,14 +441,14 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx,
  * @param user_data the `struct PseuLookupContext`
  */
 void
-GNUNET_GTK_enter_nick_window_execute_button_clicked_cb (GtkButton * button, 
+GNUNET_GTK_enter_nick_window_execute_button_clicked_cb (GtkButton * button,
                                                         gpointer user_data)
 {
   struct PseuLookupContext *lctx = user_data;
   GtkEntry *entry;
   const char *nick;
-  
-  entry = GTK_ENTRY (gtk_builder_get_object 
+
+  entry = GTK_ENTRY (gtk_builder_get_object
                      (lctx->nick_dialog_builder,
                       "GNUNET_GTK_enter_nick_window_nick_entry"));
   nick = gtk_entry_get_text (entry);
@@ -461,8 +461,8 @@ GNUNET_GTK_enter_nick_window_execute_button_clicked_cb (GtkButton * button,
   }
   save_pseudonym_with_nick (lctx, nick);
   gtk_widget_destroy (lctx->nick_dialog);
-  g_object_unref (G_OBJECT (lctx->nick_dialog_builder));  
-  lctx->nick_dialog_builder = NULL;  
+  g_object_unref (G_OBJECT (lctx->nick_dialog_builder));
+  lctx->nick_dialog_builder = NULL;
   lctx->nick_dialog = NULL;
 }
 
@@ -474,7 +474,7 @@ GNUNET_GTK_enter_nick_window_execute_button_clicked_cb (GtkButton * button,
  * @param user_data the `struct PseuLookupContext`
  */
 void
-GNUNET_GTK_enter_nick_window_nick_entry_changed_cb (GtkWidget *widget, 
+GNUNET_GTK_enter_nick_window_nick_entry_changed_cb (GtkWidget *widget,
                                                     gpointer user_data)
 {
   struct PseuLookupContext *lctx = user_data;
@@ -497,7 +497,7 @@ GNUNET_GTK_enter_nick_window_nick_entry_changed_cb (GtkWidget *widget,
  * @param user_data the `struct PseuLookupContext`
  */
 void
-GNUNET_GTK_enter_nick_window_cancel_button_clicked_cb (GtkButton * button, 
+GNUNET_GTK_enter_nick_window_cancel_button_clicked_cb (GtkButton * button,
                                                        gpointer user_data)
 {
   struct PseuLookupContext *lctx = user_data;
@@ -521,7 +521,7 @@ ask_for_nickname (struct PseuLookupContext *lctx)
   lctx->nick_dialog = GTK_WIDGET (gtk_builder_get_object (lctx->nick_dialog_builder,
                                                               "GNUNET_GTK_enter_nick_window"));
   /* show the window */
-  gtk_window_present (GTK_WINDOW (lctx->nick_dialog));  
+  gtk_window_present (GTK_WINDOW (lctx->nick_dialog));
 }
 
 
@@ -548,7 +548,7 @@ lookup_finished (void *cls,
   if (NULL != lctx->progress_dialog_builder)
   {
     gtk_widget_destroy (lctx->progress_dialog);
-    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));
     lctx->progress_dialog_builder = NULL;
     lctx->progress_dialog = NULL;
   }
@@ -588,7 +588,7 @@ GNUNET_FS_GTK_pseu_progress_dialog_cancel_button_clicked_cb (GtkButton *button,
   if (NULL != lctx->progress_dialog_builder)
   {
     gtk_widget_destroy (lctx->progress_dialog);
-    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));  
+    g_object_unref (G_OBJECT (lctx->progress_dialog_builder));
     lctx->progress_dialog_builder = NULL;
     lctx->progress_dialog = NULL;
   }
@@ -645,7 +645,7 @@ GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb (GtkWidget *widget,
  * @param user_data the main window context builder
  */
 void
-GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button, 
+GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
                                       gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
@@ -687,7 +687,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
   if (0 == anonymity_level)
   {
     /* setup the dialog and get the widgets we need most */
-    lctx->progress_dialog_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_pseu_progress_dialog.glade", 
+    lctx->progress_dialog_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_pseu_progress_dialog.glade",
                                                                 lctx);
     lctx->progress_dialog = GTK_WIDGET (gtk_builder_get_object (lctx->progress_dialog_builder,
                                                                 "GNUNET_FS_GTK_pseu_progress_dialog"));
@@ -729,7 +729,7 @@ main_window_search_namespace_combobox_changed_cb (GtkComboBox *widget,
   const gchar *text;
   struct GNUNET_CRYPTO_EccPublicSignKey pkey;
   int ret;
-  
+
   text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
   ret = GNUNET_NAMESTORE_zkey_to_pkey (text, &pkey);
   button = GTK_BUTTON (GNUNET_FS_GTK_get_main_window_object
diff --git a/src/fs/gnunet-fs-gtk_main-window-view-toggles.c b/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
index 25749be6..f8e1b9c3 100644
--- a/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
+++ b/src/fs/gnunet-fs-gtk_main-window-view-toggles.c
@@ -35,7 +35,7 @@
  * @param toggle_menu name of menu entry
  */
 static void
-toggle_view (const char *toggled_widget, 
+toggle_view (const char *toggled_widget,
              const char *toggle_menu)
 {
   GtkCheckMenuItem *mi;
@@ -79,7 +79,7 @@ check_extras ()
  * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy, 
+GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy,
                                               gpointer data)
 {
   toggle_view ("GNUNET_GTK_main_window_preview_image",
@@ -95,7 +95,7 @@ GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy,
  * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy, 
+GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy,
                                                gpointer data)
 {
   toggle_view ("GNUNET_GTK_main_window_metadata_treeview",
@@ -112,7 +112,7 @@ GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy,
  * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_search_toggled_cb (GtkWidget * dummy, 
+GNUNET_GTK_main_menu_view_search_toggled_cb (GtkWidget * dummy,
                                              gpointer data)
 {
   toggle_view ("main_window_search_hbox",
diff --git a/src/fs/gnunet-fs-gtk_open-directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index ae05b2e2..8e255106 100644
--- a/src/fs/gnunet-fs-gtk_open-directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -40,7 +40,7 @@ struct AddChildContext
    * Reference to the directorie's search result.
    */
   struct SearchResult *sr;
-  
+
   /**
    * Anonymity level to use for probes in the directory.
    */
@@ -94,9 +94,9 @@ add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
     return;
   }
   GNUNET_assert (NULL !=
-                 GNUNET_GTK_add_search_result (acc->sr->tab, 
+                 GNUNET_GTK_add_search_result (acc->sr->tab,
                                                acc->anonymity,
-                                               acc->sr->rr, 
+                                               acc->sr->rr,
                                                uri,
                                                meta, NULL, 0));
 }
diff --git a/src/fs/gnunet-fs-gtk_open-uri.c b/src/fs/gnunet-fs-gtk_open-uri.c
index c272083d..86e7778c 100644
--- a/src/fs/gnunet-fs-gtk_open-uri.c
+++ b/src/fs/gnunet-fs-gtk_open-uri.c
@@ -61,7 +61,7 @@ GNUNET_FS_GTK_handle_uri_string (const char *uris,
 
 /**
  * User selected "execute" in the open-URI dialog.
- * 
+ *
  * @param button the execute button
  * @param user_data the `GtkBuilder` of the URI dialog
  */
@@ -92,20 +92,20 @@ GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
   {
     GNUNET_break (0);
     gtk_widget_destroy (dialog);
-    g_object_unref (G_OBJECT (builder));  
+    g_object_unref (G_OBJECT (builder));
     return;
   }
   GNUNET_break (GNUNET_OK ==
                 GNUNET_FS_GTK_handle_uri_string (uris, anonymity_level));
-  g_free (uris); 
+  g_free (uris);
   gtk_widget_destroy (dialog);
-  g_object_unref (G_OBJECT (builder));  
+  g_object_unref (G_OBJECT (builder));
 }
 
 
 /**
  * User selected "cancel" in the open-URI dialog.
- * 
+ *
  * @param button the cancel button
  * @param user_data the 'GtkBuilder' of the URI dialog
  */
@@ -117,7 +117,7 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
   GtkWidget *dialog;
 
   dialog = GTK_WIDGET (gtk_builder_get_object
-                       (builder, 
+                       (builder,
                         "GNUNET_GTK_open_url_window"));
   gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (builder));
@@ -126,7 +126,7 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
 
 /**
  * User closed the window of the open-URI dialog.
- * 
+ *
  * @param widget the window
  * @param event the deletion event
  * @param user_data the 'GtkBuilder' of the URI dialog
@@ -147,7 +147,7 @@ GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
 /**
  * User pushed a key in the open-URI dialog, check if we currently
  * have valid URI and if the key was 'RETURN', run the action.
- * 
+ *
  * @param widget the window
  * @param event the deletion event
  * @param user_data the 'GtkBuilder' of the URI dialog
@@ -163,7 +163,7 @@ GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb (GtkWidget * widget,
   if (event->keyval != GDK_KEY_Return)
     return FALSE;
   execute = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                "GNUNET_GTK_open_url_dialog_execute_button"));  
+                                                "GNUNET_GTK_open_url_dialog_execute_button"));
   if (gtk_widget_get_sensitive (execute))
     GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GTK_BUTTON (execute),
                                                           user_data);
@@ -174,7 +174,7 @@ GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb (GtkWidget * widget,
 /**
  * User edited the URI of the open-URI dialog, check if it is currently
  * a valid URI and update the sensitivity of the 'execute' button accordingly.
- * 
+ *
  * @param textbuffer the updated buffer
  * @param user_data the 'GtkBuilder' of the URI dialog
  */
@@ -240,7 +240,7 @@ GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
     return;
   }
   dialog = GTK_WIDGET (gtk_builder_get_object
-                       (builder, 
+                       (builder,
                         "GNUNET_GTK_open_url_window"));
   tb = GTK_TEXT_BUFFER (gtk_builder_get_object
                         (builder,
@@ -251,7 +251,7 @@ GNUNET_GTK_main_menu_file_download_uri_activate_cb (GtkWidget * dummy,
 
   /* FIXME-FEATURE: query the clipboard, maybe there's valid URI in there?
    * If so, get it. */
-  combo = GTK_COMBO_BOX (gtk_builder_get_object 
+  combo = GTK_COMBO_BOX (gtk_builder_get_object
                          (builder,
                           "GNUNET_GTK_open_url_dialog_anonymity_combobox"));
   gtk_combo_box_set_model (combo, GNUNET_FS_GTK_get_anonymity_level_list_store ());
diff --git a/src/fs/gnunet-fs-gtk_open-uri.h b/src/fs/gnunet-fs-gtk_open-uri.h
index e41de56a..cc85754c 100644
--- a/src/fs/gnunet-fs-gtk_open-uri.h
+++ b/src/fs/gnunet-fs-gtk_open-uri.h
@@ -31,8 +31,8 @@
  *
  * @param uris string we got
  * @param anonymity_level anonymity level to use
- * @return #GNUNET_OK on success, 
- *         #GNUNET_NO if the URI type is not supported, 
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO if the URI type is not supported,
  *         #GNUNET_SYSERR if we failed to parse the URI
  */
 int
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index d97ddb4e..f9994a1b 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -124,9 +124,9 @@ enum IDENTIFIERS_ModelColumns
 enum EGO_ModelColumns
   {
 
-    /** 
+    /**
      * A gchararray.
-     */  
+     */
     EGO_MC_NAME = 0,
 
     /**
@@ -156,9 +156,9 @@ struct MainPublishingDialogContext
 
   /**
    * Connection to the identity service.
-   */ 
+   */
   struct GNUNET_IDENTITY_Handle *identity;
-  
+
   /**
    * Handle to the main window of the publishing dialog.
    */
@@ -177,7 +177,7 @@ struct MainPublishingDialogContext
   /**
    * Model with the list of files to be shared.
    */
-  GtkTreeModel *file_info_treemodel;  
+  GtkTreeModel *file_info_treemodel;
 
   /**
    * Button to move selected file upwards
@@ -411,7 +411,7 @@ struct AddDirClientContext
 };
 
 
-static void 
+static void
 clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
 
 
@@ -428,7 +428,7 @@ clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
  */
 static int
 gtk_tree_iter_equals (GtkTreeModel *tm,
-                      GtkTreeIter *i1, 
+                      GtkTreeIter *i1,
                       GtkTreeIter *i2)
 {
   GtkTreePath *p1;
@@ -468,9 +468,9 @@ update_selectivity_execute_cancel (struct MainPublishingDialogContext *ctx)
 
   /* Don't let the user close the dialog until all scanners are finished and
      their windows are closed */
-  if ( (gtk_tree_model_get_iter_first (ctx->file_info_treemodel, &iter)) && 
+  if ( (gtk_tree_model_get_iter_first (ctx->file_info_treemodel, &iter)) &&
        (pub_in_global || pub_in_own) &&
-       ((!pub_in_own) || ( (NULL != ctx->ns) && 
+       ((!pub_in_own) || ( (NULL != ctx->ns) &&
                            (NULL != ns_id) &&
                            ('\0' != ns_id[0])) ) &&
        (NULL == ctx->adddir_head) )
@@ -515,9 +515,9 @@ update_selectivity_edit (struct MainPublishingDialogContext *ctx)
 
   /* figure out which move operations are currently legal */
   GNUNET_assert (gtk_tree_selection_get_selected (ctx->file_info_selection, NULL, &iter));
-  if (gtk_tree_model_iter_next (ctx->file_info_treemodel, &iter))  
-    gtk_widget_set_sensitive (ctx->down_button, TRUE);  
-  else  
+  if (gtk_tree_model_iter_next (ctx->file_info_treemodel, &iter))
+    gtk_widget_set_sensitive (ctx->down_button, TRUE);
+  else
     gtk_widget_set_sensitive (ctx->down_button, FALSE);
   GNUNET_assert (gtk_tree_selection_get_selected (ctx->file_info_selection, NULL, &iter));
   if (gtk_tree_model_iter_parent (ctx->file_info_treemodel, &parent, &iter))
@@ -540,14 +540,14 @@ update_selectivity_edit (struct MainPublishingDialogContext *ctx)
     is_dir = GNUNET_FS_file_information_is_directory (fip);
     GNUNET_assert (gtk_tree_model_iter_next (ctx->file_info_treemodel, &pred));
   }
-  if (GNUNET_YES == is_dir)  
-    gtk_widget_set_sensitive (ctx->right_button, TRUE);  
-  else  
-    gtk_widget_set_sensitive (ctx->right_button, FALSE);  
-  if (GNUNET_SYSERR != is_dir)  
-    gtk_widget_set_sensitive (ctx->up_button, TRUE);  
-  else  
-    gtk_widget_set_sensitive (ctx->up_button, FALSE);  
+  if (GNUNET_YES == is_dir)
+    gtk_widget_set_sensitive (ctx->right_button, TRUE);
+  else
+    gtk_widget_set_sensitive (ctx->right_button, FALSE);
+  if (GNUNET_SYSERR != is_dir)
+    gtk_widget_set_sensitive (ctx->up_button, TRUE);
+  else
+    gtk_widget_set_sensitive (ctx->up_button, FALSE);
 }
 
 
@@ -558,7 +558,7 @@ update_selectivity_edit (struct MainPublishingDialogContext *ctx)
  * @param user_data master publishing dialog context of our window
  */
 static void
-selection_changed_cb (GtkTreeSelection * ts, 
+selection_changed_cb (GtkTreeSelection * ts,
                       gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
@@ -577,9 +577,9 @@ selection_changed_cb (GtkTreeSelection * ts,
  * @param pos iterator to set to the location of the new element
  */
 static void
-create_dir_at_iter (struct MainPublishingDialogContext *ctx, 
+create_dir_at_iter (struct MainPublishingDialogContext *ctx,
                     const char *name,
-                    const struct GNUNET_FS_BlockOptions *bo, 
+                    const struct GNUNET_FS_BlockOptions *bo,
                     GtkTreeIter * iter,
                     GtkTreeIter * pos)
 {
@@ -601,12 +601,12 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
   fi = GNUNET_FS_file_information_create_empty_directory
       (GNUNET_FS_GTK_get_fs_handle (), row_reference, NULL, meta, bo, name);
   GNUNET_CONTAINER_meta_data_destroy (meta);
-  gtk_tree_store_set (GTK_TREE_STORE (ctx->file_info_treemodel), pos, 
-                      PUBLISH_MC_FILESIZE, MARKER_DIR_FILE_SIZE, 
+  gtk_tree_store_set (GTK_TREE_STORE (ctx->file_info_treemodel), pos,
+                      PUBLISH_MC_FILESIZE, MARKER_DIR_FILE_SIZE,
                       PUBLISH_MC_DO_INDEX, (gboolean) GNUNET_NO,
-                      PUBLISH_MC_FILENAME, name, 
-                      PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level, 
-                      PUBLISH_MC_PRIORITY, (guint) bo->content_priority, 
+                      PUBLISH_MC_FILENAME, name,
+                      PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level,
+                      PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
                       PUBLISH_MC_FILE_INFORMATION_STRUCT, fi,
                       PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
                       (guint64) bo->expiration_time.abs_value_us,
@@ -653,7 +653,7 @@ copy_entry (struct MainPublishingDialogContext *ctx, GtkTreeModel * tm, GtkTreeI
     char *fsf;
 
     gtk_tree_model_get (tm, old,
-                        PUBLISH_MC_FILESIZE, &fsf, 
+                        PUBLISH_MC_FILESIZE, &fsf,
                         PUBLISH_MC_DO_INDEX, &do_index,
                         PUBLISH_MC_FILENAME, &short_fn,
                         PUBLISH_MC_ANONYMITY_LEVEL, &anonymity_level,
@@ -820,7 +820,7 @@ generate_update_id (const gchar *new_text)
  *         FALSE otherwise
  */
 static gboolean
-update_id_is_autofilled (const gchar *existing_update_id, 
+update_id_is_autofilled (const gchar *existing_update_id,
                          const gchar *previous_id)
 {
   gboolean result;
@@ -852,10 +852,10 @@ maybe_change_update_id (struct MainPublishingDialogContext *ctx,
   new_update_id = NULL;
   existing_update_id = gtk_entry_get_text (GTK_ENTRY (ctx->update_id_entry));
 
-  if ( ( (NULL == ctx->previous_id) && 
-         ('\0' == existing_update_id[0]) ) || 
+  if ( ( (NULL == ctx->previous_id) &&
+         ('\0' == existing_update_id[0]) ) ||
        ( (NULL != ctx->previous_id) &&
-         update_id_is_autofilled (existing_update_id, 
+         update_id_is_autofilled (existing_update_id,
                                   ctx->previous_id) ) )
     new_update_id = generate_update_id (new_text);
   if (NULL != new_update_id)
@@ -877,7 +877,7 @@ maybe_change_update_id (struct MainPublishingDialogContext *ctx,
  * @param user_data our `struct MainPublishingDialogContext`
  */
 void
-GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb (GtkWidget *widget, 
+GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb (GtkWidget *widget,
                                                               gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
@@ -1042,12 +1042,12 @@ GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
     GNUNET_assert (TRUE == gtk_tree_model_iter_children (ctx->file_info_treemodel, &pred, &parent));
     pprev = &parent;
   }
-  else if (! gtk_tree_model_get_iter_first (ctx->file_info_treemodel, &pred))  
+  else if (! gtk_tree_model_get_iter_first (ctx->file_info_treemodel, &pred))
   {
     GNUNET_break (0);
     return;
-  } 
-  pprev = NULL;    
+  }
+  pprev = NULL;
   /* iterate over 'next' of pred to find out who our predecessor is! */
   while (GNUNET_YES != gtk_tree_iter_equals (ctx->file_info_treemodel, &pred, &iter))
   {
@@ -1147,7 +1147,7 @@ GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
  * @param bo publishing options, unused
  * @param do_index indexing option, unused
  * @param client_info pointer to the GtkTreeRowReference, freed
- * @return GNUNET_OK to traverse entire subtree 
+ * @return GNUNET_OK to traverse entire subtree
  */
 static int
 free_fi_row_reference (void *cls, struct GNUNET_FS_FileInformation *fi,
@@ -1216,7 +1216,7 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   {
     rr = gtk_tree_row_reference_new (ctx->file_info_treemodel, path);
     gtk_tree_path_free (path);
-  } 
+  }
 
   /* 'iter' might have again been clobbered, get it one more time... */
   GNUNET_assert (gtk_tree_selection_get_selected (ctx->file_info_selection, NULL, &iter));
@@ -1225,7 +1225,7 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   gtk_tree_model_get (ctx->file_info_treemodel, &iter,
                       PUBLISH_MC_FILE_INFORMATION_STRUCT, &fip, -1);
   GNUNET_FS_file_information_destroy (fip, &free_fi_row_reference, NULL);
-  GNUNET_FS_GTK_remove_treestore_subtree  (GTK_TREE_STORE (ctx->file_info_treemodel), 
+  GNUNET_FS_GTK_remove_treestore_subtree  (GTK_TREE_STORE (ctx->file_info_treemodel),
                                            &iter);
 
   /* finally, select the item from 'rr' (if any) */
@@ -1263,9 +1263,9 @@ destroy_progress_dialog (struct AddDirClientContext *adcc)
     adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
   }
   gtk_widget_destroy (adcc->progress_dialog);
-  g_object_unref (G_OBJECT (adcc->progress_dialog_builder));  
+  g_object_unref (G_OBJECT (adcc->progress_dialog_builder));
   GNUNET_CONTAINER_DLL_remove (adcc->ctx->adddir_head,
-                               adcc->ctx->adddir_tail, 
+                               adcc->ctx->adddir_tail,
                                adcc);
   update_selectivity_execute_cancel (adcc->ctx);
   update_selectivity_edit (adcc->ctx);
@@ -1315,7 +1315,7 @@ GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget,
 
 
 /**
- * Display some additional information in the text area of the 
+ * Display some additional information in the text area of the
  * progress dialog.
  *
  * @param adcc  progress dialog context of our window
@@ -1344,10 +1344,10 @@ insert_progress_dialog_text (struct AddDirClientContext *adcc,
  * @param item_iter entry to set to the added item (OUT)
  */
 static void
-add_item (struct AddDirClientContext *adcc, 
+add_item (struct AddDirClientContext *adcc,
           GtkTreeStore *ts,
-          struct GNUNET_FS_ShareTreeItem *item, 
-          GtkTreeIter *parent, 
+          struct GNUNET_FS_ShareTreeItem *item,
+          GtkTreeIter *parent,
           GtkTreeIter *sibling,
           GtkTreeIter *item_iter)
 {
@@ -1357,7 +1357,7 @@ add_item (struct AddDirClientContext *adcc,
   GtkTreePath *path;
   struct stat sbuf;
   uint64_t fsize;
-  
+
   if (0 != STAT (item->filename,
                  &sbuf))
   {
@@ -1382,26 +1382,26 @@ add_item (struct AddDirClientContext *adcc,
       item->meta = GNUNET_CONTAINER_meta_data_create ();
     GNUNET_FS_meta_data_make_directory (item->meta);
 
-    fi = GNUNET_FS_file_information_create_empty_directory (GNUNET_FS_GTK_get_fs_handle (), 
-                                                            row_reference, 
+    fi = GNUNET_FS_file_information_create_empty_directory (GNUNET_FS_GTK_get_fs_handle (),
+                                                            row_reference,
                                                             item->ksk_uri,
-                                                            item->meta, 
-                                                            &adcc->directory_scan_bo, 
+                                                            item->meta,
+                                                            &adcc->directory_scan_bo,
                                                             item->filename);
     file_size_fancy = GNUNET_strdup (MARKER_DIR_FILE_SIZE);
   }
   else
   {
-    fi = GNUNET_FS_file_information_create_from_file (GNUNET_FS_GTK_get_fs_handle (), 
-                                                      row_reference, 
+    fi = GNUNET_FS_file_information_create_from_file (GNUNET_FS_GTK_get_fs_handle (),
+                                                      row_reference,
                                                       item->filename,
-                                                      item->ksk_uri, 
-                                                      item->meta, 
+                                                      item->ksk_uri,
+                                                      item->meta,
                                                       adcc->directory_scan_do_index,
                                                       &adcc->directory_scan_bo);
     file_size_fancy = GNUNET_STRINGS_byte_size_fancy (fsize);
   }
-  gtk_tree_store_set (ts, item_iter, 
+  gtk_tree_store_set (ts, item_iter,
                       PUBLISH_MC_FILESIZE, file_size_fancy,
                       PUBLISH_MC_DO_INDEX,
                       (gboolean) adcc->directory_scan_do_index,
@@ -1437,12 +1437,12 @@ add_share_items_to_treestore (struct AddDirClientContext *adcc,
   GtkTreeIter last_added;
   struct GNUNET_FS_ShareTreeItem *item;
 
-  sibling_iter = NULL;  
+  sibling_iter = NULL;
   for (item = toplevel; NULL != item; item = item->next)
   {
     add_item (adcc, ts, item, parent_iter, sibling_iter, &last_added);
     sibling_iter = &last_added;
-    if (item->is_directory == GNUNET_YES) 
+    if (item->is_directory == GNUNET_YES)
       add_share_items_to_treestore (adcc,
                                     item->children_head,
                                     sibling_iter);
@@ -1452,7 +1452,7 @@ add_share_items_to_treestore (struct AddDirClientContext *adcc,
 
 /**
  * Function called when the scanner had some trouble and we
- * need to abort the scanning process (which we need to do 
+ * need to abort the scanning process (which we need to do
  * in a separate task).
  *
  * @param cls  progress dialog context of our window
@@ -1463,7 +1463,7 @@ stop_scanner_task (void *cls,
                    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct AddDirClientContext *adcc = cls;
- 
+
   adcc->kill_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != adcc->ds)
     {
@@ -1483,7 +1483,7 @@ stop_scanner_task (void *cls,
  * @param reason kind of progress that was made
  */
 static void
-directory_scan_cb (void *cls, 
+directory_scan_cb (void *cls,
                    const char *filename, int is_directory,
                    enum GNUNET_FS_DirScannerProgressUpdateReason reason)
 {
@@ -1525,16 +1525,16 @@ directory_scan_cb (void *cls,
                                                          "GNUNET_FS_GTK_progress_dialog_scrolled_window")));
 #endif
     insert_progress_dialog_text (adcc, s);
-    GNUNET_free (s);    
+    GNUNET_free (s);
     break;
   case GNUNET_FS_DIRSCANNER_ALL_COUNTED:
     fraction = (adcc->total == 0) ? 1.0 : (1.0 * adcc->done) / adcc->total;
-    GNUNET_asprintf (&s, "%u/%u (%3f%%)", 
+    GNUNET_asprintf (&s, "%u/%u (%3f%%)",
                      adcc->done,
                      adcc->total,
                      100.0 * fraction);
     gtk_progress_bar_set_text (adcc->progress_dialog_bar,
-                               s);    
+                               s);
     GNUNET_free (s);
     gtk_progress_bar_set_fraction (adcc->progress_dialog_bar,
                                    fraction);
@@ -1549,12 +1549,12 @@ directory_scan_cb (void *cls,
     adcc->done++;
     GNUNET_assert (adcc->done <= adcc->total);
     fraction = (adcc->total == 0) ? 1.0 : (1.0 * adcc->done) / adcc->total;
-    GNUNET_asprintf (&s, "%u/%u (%3f%%)", 
+    GNUNET_asprintf (&s, "%u/%u (%3f%%)",
                      adcc->done,
                      adcc->total,
                      100.0 * fraction);
     gtk_progress_bar_set_text (adcc->progress_dialog_bar,
-                               s);    
+                               s);
     GNUNET_free (s);
     gtk_progress_bar_set_fraction (adcc->progress_dialog_bar,
                                    fraction);
@@ -1575,7 +1575,7 @@ directory_scan_cb (void *cls,
       directory_scan_result = GNUNET_FS_directory_scan_get_result (adcc->ds);
       adcc->ds = NULL;
       GNUNET_FS_share_tree_trim (directory_scan_result);
-      add_share_items_to_treestore (adcc, 
+      add_share_items_to_treestore (adcc,
                                     directory_scan_result,
                                     NULL);
       GNUNET_FS_share_tree_free (directory_scan_result);
@@ -1600,9 +1600,9 @@ directory_scan_cb (void *cls,
  * @param do_index should we index or insert files (by default)
  */
 static void
-scan_file_or_directory (struct MainPublishingDialogContext *ctx, 
+scan_file_or_directory (struct MainPublishingDialogContext *ctx,
                         gchar *filename,
-                        struct GNUNET_FS_BlockOptions *bo, 
+                        struct GNUNET_FS_BlockOptions *bo,
                         int do_index)
 {
   struct AddDirClientContext *adcc;
@@ -1633,7 +1633,7 @@ scan_file_or_directory (struct MainPublishingDialogContext *ctx,
 
   /* actually start the scan */
   adcc->ds = GNUNET_FS_directory_scan_start (filename,
-                                             GNUNET_NO, NULL, 
+                                             GNUNET_NO, NULL,
                                              &directory_scan_cb, adcc);
 
   /* disables 'cancel' button of the master dialog */
@@ -1663,7 +1663,7 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
 
     filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
     if (! GNUNET_GTK_get_selected_anonymity_level
-        (ctx->open_directory_builder, 
+        (ctx->open_directory_builder,
          "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
          &bo.anonymity_level))
     {
@@ -1675,7 +1675,7 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
                                    (gtk_builder_get_object
                                     (ctx->open_directory_builder,
                                      "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
-    bo.replication_level = 
+    bo.replication_level =
       gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                  (gtk_builder_get_object
                                   (ctx->open_directory_builder,
@@ -1740,7 +1740,7 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
 
       sb = GTK_SPIN_BUTTON (gtk_builder_get_object
                             (ctx->open_file_builder,
-                             "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));      
+                             "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
       bo.expiration_time = GNUNET_GTK_get_expiration_time (sb);
     }
     bo.replication_level =
@@ -1766,7 +1766,7 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
 /**
  * User clicked on the 'add' button in the master publish dialog.
  * Create the dialog to allow the user to select a file to add.
- * 
+ *
  * FIXME-UGLY: lots of code duplication between files & directories here...
  *
  * @param dummy the button that was pressed
@@ -1791,10 +1791,10 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
 
   {
     GtkComboBox *combo;
-    
+
     combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_file_builder,
                                                    "GNUNET_GTK_publish_file_dialog_anonymity_combobox"));
-    gtk_combo_box_set_model (combo, 
+    gtk_combo_box_set_model (combo,
                              GNUNET_FS_GTK_get_anonymity_level_list_store ());
   }
 
@@ -1908,12 +1908,12 @@ update_treeview_after_edit (void *cls, struct GNUNET_FS_FileInformation *fi,
 {
   struct EditPublishContext *epc = cls;
   char *name;
-              
+
   name = GNUNET_CONTAINER_meta_data_get_by_type (meta,
                                                  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
   gtk_tree_store_set (GTK_TREE_STORE (epc->tm), &epc->iter,
                       PUBLISH_MC_DO_INDEX, *do_index,
-                      PUBLISH_MC_FILENAME, name, 
+                      PUBLISH_MC_FILENAME, name,
                       PUBLISH_MC_ANONYMITY_LEVEL, (guint) bo->anonymity_level,
                       PUBLISH_MC_PRIORITY, (guint) bo->content_priority,
                       PUBLISH_MC_EXPIRATION_TIME_ABSOLUTE,
@@ -1972,9 +1972,9 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
                       &epc->iter,
                       PUBLISH_MC_FILE_INFORMATION_STRUCT, &epc->fip,
                       -1);
-  GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog, 
-                                     epc->fip, 
-                                     GNUNET_NO, 
+  GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog,
+                                     epc->fip,
+                                     GNUNET_NO,
                                      &master_publish_edit_publish_dialog_cb,
                                      epc);
 }
@@ -2100,10 +2100,10 @@ close_master_publish_dialog (struct MainPublishingDialogContext *ctx)
  */
 static int
 insert_advertisement (void *cls, struct GNUNET_FS_FileInformation *fi,
-                      uint64_t length, 
+                      uint64_t length,
                       struct GNUNET_CONTAINER_MetaData *meta,
                       struct GNUNET_FS_Uri **uri,
-                      struct GNUNET_FS_BlockOptions *bo, 
+                      struct GNUNET_FS_BlockOptions *bo,
                       int *do_index,
                       void **client_info)
 {
@@ -2123,7 +2123,7 @@ insert_advertisement (void *cls, struct GNUNET_FS_FileInformation *fi,
 
   GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>",
                                      EXTRACTOR_METATYPE_URI, EXTRACTOR_METAFORMAT_UTF8,
-                                     "text/plain", 
+                                     "text/plain",
                                      sks_uri_string,
                                      strlen (sks_uri_string) + 1);
   GNUNET_free (sks_uri_string);
@@ -2178,7 +2178,7 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
     if (NULL != (id_entry_text = gtk_entry_get_text (GTK_ENTRY (ctx->identifier_entry))))
       namespace_id = g_strdup (id_entry_text);
     else if (!do_global)
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Global publication is disabled, but namespace_id is not available\n");
     if ((NULL != namespace_id) && ('\0' == namespace_id[0]))
     {
@@ -2214,10 +2214,10 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
       fi = get_file_information (ctx->file_info_treemodel, &iter);
       if (do_global && do_own && !disable_ads_insertion)
         GNUNET_FS_file_information_inspect (fi, insert_advertisement, ctx);
-      GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (), 
+      GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (),
                                fi,
-                               (NULL == ns) 
-                               ? NULL 
+                               (NULL == ns)
+                               ? NULL
                                : GNUNET_IDENTITY_ego_get_private_key (ns),
                                namespace_id, namespace_uid,
                                GNUNET_FS_PUBLISH_OPTION_NONE);
@@ -2278,7 +2278,7 @@ clear_keywords_from_file_information_in_tree_store (GtkTreeModel * tm,
 {
   GtkTreeIter child;
   struct GNUNET_FS_FileInformation *fip;
-  
+
   gtk_tree_model_get (tm, iter, PUBLISH_MC_FILE_INFORMATION_STRUCT, &fip, -1);
   if (NULL != fip)
   {
@@ -2398,7 +2398,7 @@ expander_callback (GObject    *object,
   g_value_init (&gv, G_TYPE_BOOLEAN);
   g_value_set_boolean (&gv, expanded);
   gtk_container_child_set_property (GTK_CONTAINER (ctx->vpaned),
-                                    ctx->bottom_frame, 
+                                    ctx->bottom_frame,
                                     "resize", &gv);
   paned_pos = gtk_paned_get_position (GTK_PANED (ctx->vpaned));
   paned_pos = paned_pos + (scrolled_allocation.height * (expanded ? -1 : 1));
@@ -2492,7 +2492,7 @@ add_updateable_to_ts (void *cls, const char *last_id,
     urilen = 0;
 
   mdbuf = NULL;
-  mdsize = GNUNET_CONTAINER_meta_data_serialize (last_meta, 
+  mdsize = GNUNET_CONTAINER_meta_data_serialize (last_meta,
                                                  &mdbuf, 64*1024,
                                                  GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
   if (0 > mdsize)
@@ -2575,12 +2575,12 @@ add_updateable_to_ts (void *cls, const char *last_id,
   sc.ns = uc->ns;
   sc.seen = uc->seen;
   sc.update_called = GNUNET_NO;
-  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (),
                                        GNUNET_IDENTITY_ego_get_private_key (uc->ns),
                                        next_id,
                                        &add_updateable_to_ts,
                                        &sc);
-  if ((sc.update_called == GNUNET_NO) && 
+  if ((sc.update_called == GNUNET_NO) &&
       (NULL != next_id) &&
       (strlen (next_id) > 0))
   {
@@ -2608,8 +2608,8 @@ add_updateable_to_ts (void *cls, const char *last_id,
  * @return #GNUNET_YES, always.
  */
 static int
-free_seen_paths (void *cls, 
-                 const struct GNUNET_HashCode *key, 
+free_seen_paths (void *cls,
+                 const struct GNUNET_HashCode *key,
                  void *value)
 {
   GNUNET_free_non_null (value);
@@ -2669,7 +2669,7 @@ GNUNET_GTK_master_publish_dialog_ego_combobox_changed_cb (GtkComboBox *combo,
   uc.update_called = GNUNET_NO;
   uc.seen = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
 
-  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (),
                                        GNUNET_IDENTITY_ego_get_private_key (ego),
                                        NULL,
                                        &add_updateable_to_ts,
@@ -2689,7 +2689,7 @@ GNUNET_GTK_master_publish_dialog_ego_combobox_changed_cb (GtkComboBox *combo,
  *
  * @param cls our `struct MainPublishingDialogContext`
  * @param ego identity of the namespace to add
- * @param ego_ctx where to store context data 
+ * @param ego_ctx where to store context data
  * @param name name of the namespace to add
  */
 static void
@@ -2714,14 +2714,14 @@ add_namespace_to_ts (void *cls,
   {
     /* insert operation */
     GNUNET_assert (NULL != name);
-    gtk_list_store_insert_with_values (ls, 
+    gtk_list_store_insert_with_values (ls,
                                        &iter, G_MAXINT,
                                        EGO_MC_NAME, name,
                                        EGO_MC_EGO, ego,
                                        -1);
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (ls),
                                     &iter);
-    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ls), 
+    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ls),
                                      path);
     gtk_tree_path_free (path);
     *ego_ctx = rr;
@@ -2741,13 +2741,13 @@ add_namespace_to_ts (void *cls,
   {
     /* rename operation */
     path = gtk_tree_row_reference_get_path (rr);
-    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls), 
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls),
                                             &iter, path));
-    gtk_list_store_set (ls, 
+    gtk_list_store_set (ls,
                         &iter, G_MAXINT,
                         EGO_MC_NAME, name,
                         -1);
-    gtk_tree_path_free (path);  
+    gtk_tree_path_free (path);
   }
   have_ns = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls), &iter);
   gtk_widget_set_sensitive (ctx->own_checkbox, have_ns);
@@ -2759,12 +2759,12 @@ add_namespace_to_ts (void *cls,
 
 /**
  * Run the file-publishing operation (by opening the master publishing dialog).
- * 
+ *
  * @param dummy widget that triggered the action
  * @param user_data builder of the main window
  */
 void
-GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, 
+GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
                                                gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx;
@@ -2873,7 +2873,7 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy,
   /* show dialog */
   toplevel = gtk_widget_get_toplevel (dummy);
   if (GTK_IS_WINDOW (toplevel))
-    gtk_window_set_transient_for (GTK_WINDOW (ctx->master_pubdialog), 
+    gtk_window_set_transient_for (GTK_WINDOW (ctx->master_pubdialog),
                                   GTK_WINDOW (toplevel));
   gtk_window_present (GTK_WINDOW (ctx->master_pubdialog));
 }
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 71260209..196726a1 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -300,26 +300,26 @@ change_metatypes (struct EditPublicationDialogContext *ctx, gint code)
   /* double-check that 'code' is valid */
   for (pubtype_count = 0; NULL != types[pubtype_count]; pubtype_count++) ;
   GNUNET_assert (code < pubtype_count);
-  
+
   /* clear existing selection of metatypes */
   gtk_list_store_clear (ctx->metatypes_liststore);
   max_type = EXTRACTOR_metatype_get_max ();
   /* add new types based on selection */
-  for (i = 0; types[code][i] != EXTRACTOR_METATYPE_RESERVED; i++)  
+  for (i = 0; types[code][i] != EXTRACTOR_METATYPE_RESERVED; i++)
     if ( (types[code][i] < max_type) && (types[code][i] > 0) )
-      gtk_list_store_insert_with_values (ctx->metatypes_liststore, 
-                                         &iter, G_MAXINT, 
+      gtk_list_store_insert_with_values (ctx->metatypes_liststore,
+                                         &iter, G_MAXINT,
                                          PUBLISH_METADATA_TYPES_MC_TYPE,
-                                         types[code][i], 
+                                         types[code][i],
                                          PUBLISH_METADATA_TYPES_MC_FORMAT,
-                                         EXTRACTOR_METAFORMAT_UTF8, 
+                                         EXTRACTOR_METAFORMAT_UTF8,
                                          PUBLISH_METADATA_TYPES_MC_TYPE_NAME,
                                          EXTRACTOR_metatype_to_string
                                          (types [code][i]),
                                          PUBLISH_METADATA_TYPES_MC_DESCRIPTION,
                                          EXTRACTOR_metatype_to_description
-                                         (types[code][i]), 
-                                         -1);  
+                                         (types[code][i]),
+                                         -1);
 }
 
 
@@ -361,7 +361,7 @@ metadata_selection_changed_cb (GtkTreeSelection *ts,
   struct EditPublicationDialogContext *ctx = user_data;
 
   gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object
-                                        (ctx->builder, 
+                                        (ctx->builder,
                                          "GNUNET_GTK_edit_publication_delete_button")),
                             gtk_tree_selection_get_selected (ts, NULL, NULL));
 }
@@ -377,9 +377,9 @@ metadata_selection_changed_cb (GtkTreeSelection *ts,
  * @param new_text new value for the item
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-void 
-GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellRendererText *renderer, 
-                                                                        gchar * path, 
+void
+GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellRendererText *renderer,
+                                                                        gchar * path,
                                                                         gchar * new_text,
                                                                         gpointer user_data)
 {
@@ -387,8 +387,8 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellR
   GtkTreeIter iter;
   gint type_id;
 
-  if (! gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ctx->meta_liststore), 
-                                             &iter, 
+  if (! gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ctx->meta_liststore),
+                                             &iter,
                                              path))
   {
     GNUNET_break (0);
@@ -421,10 +421,10 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb (GtkCellR
  * @param combo combo box that was dropped down
  * @param path_string which item was changed in the tree view
  * @param new_iter item that is now selected in the drop-down combo box
- * @param user_data the 'struct EditPublicationDialogContext' 
+ * @param user_data the 'struct EditPublicationDialogContext'
  */
-void 
-GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (GtkCellRendererCombo * combo, 
+void
+GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (GtkCellRendererCombo * combo,
                                                                          gchar * path_string,
                                                                          GtkTreeIter * new_iter,
                                                                          gpointer user_data)
@@ -452,7 +452,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb (GtkCell
  * @param new_text new value for the item
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-void 
+void
 GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (GtkCellRendererText * renderer,
                                                                          gchar * path,
                                                                          gchar * new_text,
@@ -467,16 +467,16 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (GtkCell
   char *pos;
 
   if (! gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ctx->meta_liststore),
-                                             &iter, 
+                                             &iter,
                                              path))
   {
     GNUNET_break (0);
     return;
   }
 
-  gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter, 
+  gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter,
                       PUBLISH_METADATA_MC_TYPE, &metatype, -1);
-  if (metatype == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
+  if (metatype == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
   {
     /* apply filename rules */
     /* First, use UNIX-style separators */
@@ -493,16 +493,16 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (GtkCell
     }
 
     /* However, directories must end with '/', so add it */
-    if ( (new_text[strlen (new_text) - 1] != '/') && 
+    if ( (new_text[strlen (new_text) - 1] != '/') &&
          ctx->is_directory == GNUNET_YES)
     {
       char * tmp;
-      
+
       GNUNET_asprintf (&tmp, "%s/", avalue);
       GNUNET_free (avalue);
       avalue = tmp;
     }
-    
+
     /* Also, replace '../' everywhere with "___" */
     while (NULL != (pos = strstr (avalue, "../")))
       memset (pos, '_', 3);
@@ -514,8 +514,8 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (GtkCell
     ivalue = new_text;
     avalue = NULL;
   }
-  gtk_list_store_set (ctx->meta_liststore, &iter, 
-                      PUBLISH_METADATA_MC_VALUE, ivalue, 
+  gtk_list_store_set (ctx->meta_liststore, &iter,
+                      PUBLISH_METADATA_MC_VALUE, ivalue,
                       -1);
   GNUNET_free_non_null (avalue);
 }
@@ -583,7 +583,7 @@ GNUNET_GTK_edit_publication_delete_button_clicked_cb (GtkButton * button,
  * @param user_data the 'struct EditPublicationDialogContext'
  */
 void
-GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (GtkFileChooserButton * widget, 
+GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (GtkFileChooserButton * widget,
                                                                               gpointer user_data)
 {
   struct EditPublicationDialogContext *ctx = user_data;
@@ -637,14 +637,14 @@ GNUNET_GTK_edit_publication_keyword_entry_changed_cb (GtkEditable * editable,
 
   keyword = gtk_entry_get_text (ctx->keyword_entry);
   gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (ctx->builder,
-                                                                "GNUNET_GTK_edit_publication_keyword_list_add_button")), 
+                                                                "GNUNET_GTK_edit_publication_keyword_list_add_button")),
                             (strlen (keyword) > 0) ? TRUE : FALSE);
 }
 
 
 /**
- * Update the sensitivity of the 'confirm' button based on 
- * the availability of keywords and whether they are required or 
+ * Update the sensitivity of the 'confirm' button based on
+ * the availability of keywords and whether they are required or
  * not.
  *
  * @param ctx the 'struct EditPublicationDialogContext'
@@ -654,7 +654,7 @@ update_confirm_sensitivity (struct EditPublicationDialogContext *ctx)
 {
   GtkTreeIter iter;
 
-  if ( (! ctx->allow_no_keywords) && 
+  if ( (! ctx->allow_no_keywords) &&
        (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->keywords_liststore),
                                          &iter)) )
     gtk_widget_set_sensitive (ctx->confirm_button, FALSE);
@@ -674,7 +674,7 @@ void
 GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (GtkButton *
                                                                 button,
                                                                 gpointer user_data)
-{ 
+{
   struct EditPublicationDialogContext *ctx = user_data;
   GtkTreeIter iter;
   GtkTreeSelection *keywords_selection;
@@ -712,7 +712,7 @@ GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb (GtkButton *
   keyword = gtk_entry_get_text (ctx->keyword_entry);
   if (strlen (keyword) == 0)
     return;
-  gtk_list_store_insert_with_values (ctx->keywords_liststore, 
+  gtk_list_store_insert_with_values (ctx->keywords_liststore,
                                      &iter, G_MAXINT,
                                      PUBLISH_TYPES_MC_KEYWORD, keyword,
                                      PUBLISH_TYPES_MC_ADDED, TRUE,
@@ -884,13 +884,13 @@ preserve_meta_items (void *cls, const char *plugin_name,
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
- * @param format basic format information about data 
+ * @param format basic format information about data
  * @param data_mime_type mime-type of data (not of the original file);
  *        can be NULL (if mime-type is not known)
  * @param data actual meta-data found
  * @param data_len number of bytes in data
  * @return 0 to continue extracting, 1 to abort
- */ 
+ */
 static int
 le_callback (void *cls,
              const char *plugin_name,
@@ -930,7 +930,7 @@ get_mime_type (const void *data,
     return NULL;
   ret = NULL;
   EXTRACTOR_extract (pl, NULL, data, data_size, &le_callback, &ret);
-  EXTRACTOR_plugin_remove_all (pl);  
+  EXTRACTOR_plugin_remove_all (pl);
   return ret;
 }
 
@@ -994,8 +994,8 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
 
   /* update meta data; first, we copy the unchanged values from the original meta data */
   ctx->md = GNUNET_CONTAINER_meta_data_create ();
-  GNUNET_CONTAINER_meta_data_iterate (meta, 
-                                      &preserve_meta_items, 
+  GNUNET_CONTAINER_meta_data_iterate (meta,
+                                      &preserve_meta_items,
                                       ctx);
   /* clear original meta data */
   GNUNET_CONTAINER_meta_data_clear (meta);
@@ -1003,7 +1003,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
   GNUNET_CONTAINER_meta_data_merge (meta, ctx->md);
   GNUNET_CONTAINER_meta_data_destroy (ctx->md);
   ctx->md = NULL;
-  /* now add all of the values from the model; adding will simply do 
+  /* now add all of the values from the model; adding will simply do
      nothing for values that are already in the set because they were preserved */
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ctx->meta_liststore), &iter))
   {
@@ -1028,7 +1028,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
     }
     while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ctx->meta_liststore), &iter));
   }
-  
+
   /* finally, if we got a new preview, add it as well */
   if (ctx->preview_changed == GNUNET_YES)
   {
@@ -1058,7 +1058,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
         GFileInfo *finfo;
         const char *gmime;
         
-        finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 
+        finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
                                    0, NULL, NULL);
         gmime = g_file_info_get_attribute_string (finfo,
                                                   G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
@@ -1082,7 +1082,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
 
 /**
  * The user clicked the 'confirm' button.  Push the edits back into the
- * FileInformation structure and given it and the options back to the 
+ * FileInformation structure and given it and the options back to the
  * callback.  Then clean up the dialog.
  *
  * @param button the cancel button
@@ -1095,11 +1095,11 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton * button,
   struct EditPublicationDialogContext *ctx = user_data;
 
   /* push back changes to file-information */
-  GNUNET_FS_file_information_inspect (ctx->fip, 
+  GNUNET_FS_file_information_inspect (ctx->fip,
                                       &file_information_update,
                                       ctx);
   /* call our continuation */
-  ctx->cb (ctx->cb_cls, 
+  ctx->cb (ctx->cb_cls,
            GTK_RESPONSE_OK,
            gtk_entry_get_text (ctx->root_entry));
   /* free resources from the edit dialog */
@@ -1144,13 +1144,13 @@ add_keyword (void *cls, const char *keyword, int is_mandatory)
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
- * @param format basic format information about data 
+ * @param format basic format information about data
  * @param data_mime_type mime-type of data (not of the original file);
  *        can be NULL (if mime-type is not known)
  * @param data actual meta-data found
  * @param data_len number of bytes in data
  * @return 0 to continue extracting, 1 to abort
- */ 
+ */
 static int
 set_window_title_to_filename (void *cls,
                               const char *plugin_name,
@@ -1188,7 +1188,7 @@ set_window_title_to_filename (void *cls,
  * @return GNUNET_SYSERR (aborts after first call)
  */
 static int
-file_information_import (void *cls, 
+file_information_import (void *cls,
                          struct GNUNET_FS_FileInformation *fi,
                          uint64_t length,
                          struct GNUNET_CONTAINER_MetaData *meta,
@@ -1226,7 +1226,7 @@ file_information_import (void *cls,
       gtk_image_set_from_pixbuf (ctx->preview_image, pixbuf);
     }
   }
-  
+
   /* Also update window title based on filename */
   gtk_window_set_title (ctx->edit_publication_window, _("<unnamed>"));
   GNUNET_CONTAINER_meta_data_iterate (meta,
@@ -1294,7 +1294,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
                       (ctx->builder,
                        "GNUNET_GTK_edit_publication_keyword_list_tree_view"));
   ctx->edit_publication_window =
-    GTK_WINDOW (gtk_builder_get_object (ctx->builder, 
+    GTK_WINDOW (gtk_builder_get_object (ctx->builder,
                                         "GNUNET_GTK_edit_publication_window"));
   ctx->keywords_liststore = GTK_LIST_STORE (gtk_builder_get_object
                        (ctx->builder, "GNUNET_GTK_publication_keywords_liststore"));
@@ -1332,7 +1332,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
                                                                 "GNUNET_GTK_edit_publication_anonymity_combobox"));
 
   /* Basic initialization of widgets models and visibility */
-  gtk_combo_box_set_model (ctx->anonymity_combo, 
+  gtk_combo_box_set_model (ctx->anonymity_combo,
                            GNUNET_FS_GTK_get_anonymity_level_list_store ());
   GNUNET_GTK_setup_expiration_year_adjustment (ctx->builder);
 
diff --git a/src/fs/gnunet-fs-gtk_unindex.c b/src/fs/gnunet-fs-gtk_unindex.c
index a4fc4c61..d7efdf8e 100644
--- a/src/fs/gnunet-fs-gtk_unindex.c
+++ b/src/fs/gnunet-fs-gtk_unindex.c
@@ -43,7 +43,7 @@ enum UNINDEX_ModelColumns
      * A guint64.
      */
     UNINDEX_MC_FILESIZE = 1,
-    
+
     /**
      * A gchararray representing a color.
      */
@@ -180,7 +180,7 @@ static struct UnindexEntry *ue_tail;
 
 
 /**
- * User has clicked on the 'delete/unindex' button for the dialog. 
+ * User has clicked on the 'delete/unindex' button for the dialog.
  * Unindex the selected file.
  *
  * @param dummy the button
@@ -203,17 +203,17 @@ GNUNET_FS_GTK_unindex_button_clicked_cb (GtkWidget * dummy,
     GNUNET_break (0);
     return;
   }
-  gtk_tree_model_get (udc->model, &iter, 
-                      UNINDEX_MC_FILENAME, &filename, 
-                      UNINDEX_MC_FILESIZE, &filesize, 
-                      UNINDEX_MC_UNINDEX_CONTEXT, &ue, 
+  gtk_tree_model_get (udc->model, &iter,
+                      UNINDEX_MC_FILENAME, &filename,
+                      UNINDEX_MC_FILESIZE, &filesize,
+                      UNINDEX_MC_UNINDEX_CONTEXT, &ue,
                       -1);
   if (NULL != ue)
   {
     GNUNET_break (0);
     g_free (filename);
     return;
-  }  
+  }
   ue = GNUNET_malloc (sizeof (struct UnindexEntry));
   ue->filesize = filesize;
   GNUNET_CONTAINER_DLL_insert (ue_head, ue_tail, ue);
@@ -223,8 +223,8 @@ GNUNET_FS_GTK_unindex_button_clicked_cb (GtkWidget * dummy,
   gtk_tree_path_free (path);
   ue->uc = GNUNET_FS_unindex_start (GNUNET_FS_GTK_get_fs_handle (),
                                     filename, ue);
-  gtk_list_store_set (GTK_LIST_STORE (udc->model), 
-                      &iter, 
+  gtk_list_store_set (GTK_LIST_STORE (udc->model),
+                      &iter,
                       UNINDEX_MC_BACKGROUND_COLOR, "yellow",
                       UNINDEX_MC_UNINDEX_CONTEXT, ue,
                       UNINDEX_MC_UNINDEX_PROGRESS, 0,
@@ -253,10 +253,10 @@ GNUNET_FS_GTK_unindex_close_button_clicked_cb (GtkWidget * dummy,
     GNUNET_FS_get_indexed_files_cancel (udc->gic);
     udc->gic = NULL;
   }
-  if (gtk_tree_model_get_iter_first (udc->model, &iter)) 
+  if (gtk_tree_model_get_iter_first (udc->model, &iter))
     do
     {
-      gtk_tree_model_get (udc->model, &iter, 
+      gtk_tree_model_get (udc->model, &iter,
                           UNINDEX_MC_UNINDEX_CONTEXT, &ue,
                           -1);
       if (NULL != ue)
@@ -264,10 +264,10 @@ GNUNET_FS_GTK_unindex_close_button_clicked_cb (GtkWidget * dummy,
         gtk_tree_row_reference_free (ue->rr);
         ue->rr = NULL;
       }
-    }  
+    }
     while (TRUE == gtk_tree_model_iter_next (udc->model, &iter));
   gtk_widget_destroy (udc->dialog);
-  g_object_unref (G_OBJECT (udc->builder));  
+  g_object_unref (G_OBJECT (udc->builder));
   GNUNET_free (udc);
   master_udc = NULL;
 }
@@ -280,7 +280,7 @@ GNUNET_FS_GTK_unindex_close_button_clicked_cb (GtkWidget * dummy,
  * @param user_data our unindex context
  */
 static void
-selection_changed_cb (GtkTreeSelection * ts, 
+selection_changed_cb (GtkTreeSelection * ts,
                       gpointer user_data)
 {
   struct UnindexDialogContext *udc = user_data;
@@ -290,8 +290,8 @@ selection_changed_cb (GtkTreeSelection * ts,
   /* find out if a file is selected */
   if (gtk_tree_selection_get_selected (udc->selection, NULL, &iter))
   {
-    gtk_tree_model_get (udc->model, &iter, 
-                        UNINDEX_MC_UNINDEX_CONTEXT, &ue, 
+    gtk_tree_model_get (udc->model, &iter,
+                        UNINDEX_MC_UNINDEX_CONTEXT, &ue,
                         -1);
     if (NULL == ue)
     {
@@ -312,7 +312,7 @@ selection_changed_cb (GtkTreeSelection * ts,
  * @param file_id hash of the contents of the indexed file
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
-static int 
+static int
 add_indexed_file (void *cls, const char *filename,
                   const struct GNUNET_HashCode * file_id)
 {
@@ -387,7 +387,7 @@ GNUNET_GTK_main_menu_unindex_activate_cb (GtkWidget * dummy,
 {
   GtkWidget *toplevel;
   struct UnindexDialogContext *udc;
-  
+
   if (NULL != master_udc)
   {
     /* window already exists, raise focus */
@@ -417,7 +417,7 @@ GNUNET_GTK_main_menu_unindex_activate_cb (GtkWidget * dummy,
                                           udc);
   toplevel = gtk_widget_get_toplevel (dummy);
   if (GTK_IS_WINDOW (toplevel))
-    gtk_window_set_transient_for (GTK_WINDOW (udc->dialog), GTK_WINDOW (toplevel));  
+    gtk_window_set_transient_for (GTK_WINDOW (udc->dialog), GTK_WINDOW (toplevel));
   /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade */
   g_signal_connect (G_OBJECT (udc->selection), "changed",
                     G_CALLBACK (selection_changed_cb), udc);
@@ -471,19 +471,19 @@ GNUNET_FS_GTK_unindex_handle_stop_ (struct UnindexEntry *ue)
   GtkTreePath *path;
   GtkTreeIter iter;
   GtkTreeModel *model;
-  
+
   if (NULL != ue->rr)
   {
     path = gtk_tree_row_reference_get_path (ue->rr);
     model = gtk_tree_row_reference_get_model (ue->rr);
     gtk_tree_row_reference_free (ue->rr);
     ue->rr = NULL;
-    GNUNET_assert (TRUE == gtk_tree_model_get_iter (model, 
+    GNUNET_assert (TRUE == gtk_tree_model_get_iter (model,
                                                     &iter,
                                                     path));
     gtk_tree_path_free (path);
-    gtk_list_store_set (GTK_LIST_STORE (model), 
-                        &iter, 
+    gtk_list_store_set (GTK_LIST_STORE (model),
+                        &iter,
                         UNINDEX_MC_UNINDEX_CONTEXT, NULL,
                         -1);
   }
@@ -515,12 +515,12 @@ GNUNET_FS_GTK_unindex_handle_error_ (struct UnindexEntry *ue,
     return;
   path = gtk_tree_row_reference_get_path (ue->rr);
   model = gtk_tree_row_reference_get_model (ue->rr);
-  GNUNET_assert (TRUE == gtk_tree_model_get_iter (model, 
+  GNUNET_assert (TRUE == gtk_tree_model_get_iter (model,
                                                   &iter,
                                                   path));
   gtk_tree_path_free (path);
-  gtk_list_store_set (GTK_LIST_STORE (model), 
-                      &iter, 
+  gtk_list_store_set (GTK_LIST_STORE (model),
+                      &iter,
                       UNINDEX_MC_BACKGROUND_COLOR, "red",
                       UNINDEX_MC_ERROR, emsg,
                       -1);
@@ -546,12 +546,12 @@ GNUNET_FS_GTK_unindex_handle_progress_ (struct UnindexEntry *ue,
     return;
   path = gtk_tree_row_reference_get_path (ue->rr);
   model = gtk_tree_row_reference_get_model (ue->rr);
-  GNUNET_assert (TRUE == gtk_tree_model_get_iter (model, 
+  GNUNET_assert (TRUE == gtk_tree_model_get_iter (model,
                                                   &iter,
                                                   path));
   gtk_tree_path_free (path);
-  gtk_list_store_set (GTK_LIST_STORE (model), 
-                      &iter, 
+  gtk_list_store_set (GTK_LIST_STORE (model),
+                      &iter,
                       UNINDEX_MC_UNINDEX_PROGRESS, ue->progress,
                       -1);
 }
@@ -573,11 +573,11 @@ GNUNET_FS_GTK_unindex_handle_completed_ (struct UnindexEntry *ue)
   {
     path = gtk_tree_row_reference_get_path (ue->rr);
     model = gtk_tree_row_reference_get_model (ue->rr);
-    GNUNET_assert (TRUE == gtk_tree_model_get_iter (model, 
+    GNUNET_assert (TRUE == gtk_tree_model_get_iter (model,
                                                     &iter,
                                                     path));
     gtk_tree_path_free (path);
-    gtk_list_store_remove (GTK_LIST_STORE (model), 
+    gtk_list_store_remove (GTK_LIST_STORE (model),
                            &iter);
     gtk_tree_row_reference_free (ue->rr);
     ue->rr = NULL;
diff --git a/src/fs/metatypes.c b/src/fs/metatypes.c
index 5e9cba98..c722aef2 100644
--- a/src/fs/metatypes.c
+++ b/src/fs/metatypes.c
@@ -1,44 +1,44 @@
 /* *INDENT-OFF* */
 
 gint types_generic[] = {
-  EXTRACTOR_METATYPE_MIMETYPE, 
+  EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
-  EXTRACTOR_METATYPE_KEYWORDS, 
+  EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_SUBJECT,
   EXTRACTOR_METATYPE_DESCRIPTION,
-  EXTRACTOR_METATYPE_COMMENT, 
+  EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_COPYRIGHT,
-  EXTRACTOR_METATYPE_URI, 
-  EXTRACTOR_METATYPE_CREATOR, 
+  EXTRACTOR_METATYPE_URI,
+  EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_CREATION_DATE,
   EXTRACTOR_METATYPE_RESERVED
 };
 
 
-gint types_text[] = 
-{ 
-  EXTRACTOR_METATYPE_MIMETYPE, 
+gint types_text[] =
+{
+  EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_ABSTRACT,
   EXTRACTOR_METATYPE_SUMMARY,
   EXTRACTOR_METATYPE_SUBJECT,
-  EXTRACTOR_METATYPE_AUTHOR_NAME, 
+  EXTRACTOR_METATYPE_AUTHOR_NAME,
   EXTRACTOR_METATYPE_AUTHOR_EMAIL,
   EXTRACTOR_METATYPE_AUTHOR_INSTITUTION,
   EXTRACTOR_METATYPE_DESCRIPTION,
-  EXTRACTOR_METATYPE_LANGUAGE, 
-  EXTRACTOR_METATYPE_COPYRIGHT, 
-  EXTRACTOR_METATYPE_COMMENT, 
+  EXTRACTOR_METATYPE_LANGUAGE,
+  EXTRACTOR_METATYPE_COPYRIGHT,
+  EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_BOOK_TITLE,
   EXTRACTOR_METATYPE_BOOK_EDITION,
-  EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER, 
+  EXTRACTOR_METATYPE_BOOK_CHAPTER_NUMBER,
   EXTRACTOR_METATYPE_JOURNAL_NAME,
-  EXTRACTOR_METATYPE_JOURNAL_VOLUME, 
+  EXTRACTOR_METATYPE_JOURNAL_VOLUME,
   EXTRACTOR_METATYPE_JOURNAL_NUMBER,
-  EXTRACTOR_METATYPE_PAGE_COUNT, 
+  EXTRACTOR_METATYPE_PAGE_COUNT,
   EXTRACTOR_METATYPE_PAGE_RANGE,
   EXTRACTOR_METATYPE_PUBLISHER,
   EXTRACTOR_METATYPE_PUBLISHER_ADDRESS,
@@ -46,11 +46,11 @@ gint types_text[] =
   EXTRACTOR_METATYPE_PUBLISHER_SERIES,
   EXTRACTOR_METATYPE_PUBLICATION_TYPE,
   EXTRACTOR_METATYPE_PUBLICATION_DATE,
-  EXTRACTOR_METATYPE_URL, 
-  EXTRACTOR_METATYPE_CREATOR, 
+  EXTRACTOR_METATYPE_URL,
+  EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_CREATION_DATE,
   EXTRACTOR_METATYPE_MODIFICATION_DATE,
-  EXTRACTOR_METATYPE_CHARACTER_SET, 
+  EXTRACTOR_METATYPE_CHARACTER_SET,
   EXTRACTOR_METATYPE_LINE_COUNT,
   EXTRACTOR_METATYPE_WORD_COUNT,
   EXTRACTOR_METATYPE_PAGE_ORIENTATION,
@@ -62,14 +62,14 @@ gint types_text[] =
 };
 
 
-gint types_music[] = 
-{                    
+gint types_music[] =
+{
   EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
-  EXTRACTOR_METATYPE_ARTIST, 
-  EXTRACTOR_METATYPE_COMPOSER, 
-  EXTRACTOR_METATYPE_CONDUCTOR, 
+  EXTRACTOR_METATYPE_ARTIST,
+  EXTRACTOR_METATYPE_COMPOSER,
+  EXTRACTOR_METATYPE_CONDUCTOR,
   EXTRACTOR_METATYPE_ALBUM,
   EXTRACTOR_METATYPE_DURATION,
   EXTRACTOR_METATYPE_KEYWORDS,
@@ -81,15 +81,15 @@ gint types_music[] =
   EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_ISRC,
   EXTRACTOR_METATYPE_LYRICS,
-  EXTRACTOR_METATYPE_COPYRIGHT, 
+  EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_PUBLISHER,
   EXTRACTOR_METATYPE_PERFORMER,
   EXTRACTOR_METATYPE_PRODUCER,
-  EXTRACTOR_METATYPE_SONG_VERSION, 
+  EXTRACTOR_METATYPE_SONG_VERSION,
   EXTRACTOR_METATYPE_URI,
   EXTRACTOR_METATYPE_CREATION_DATE,
   EXTRACTOR_METATYPE_DISCLAIMER,
-  EXTRACTOR_METATYPE_WRITER, 
+  EXTRACTOR_METATYPE_WRITER,
   EXTRACTOR_METATYPE_CONTRIBUTOR_NAME,
   EXTRACTOR_METATYPE_SONG_COUNT,
   EXTRACTOR_METATYPE_STARTING_SONG,
@@ -98,35 +98,35 @@ gint types_music[] =
   EXTRACTOR_METATYPE_ORIGINAL_ARTIST,
   EXTRACTOR_METATYPE_ORIGINAL_WRITER,
   EXTRACTOR_METATYPE_ORIGINAL_RELEASE_YEAR,
-  EXTRACTOR_METATYPE_ORIGINAL_PERFORMER, 
+  EXTRACTOR_METATYPE_ORIGINAL_PERFORMER,
   EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
   EXTRACTOR_METATYPE_SUBTITLE,
   EXTRACTOR_METATYPE_RESERVED
 };
 
 
-gint types_video[] = 
+gint types_video[] =
 {
-  EXTRACTOR_METATYPE_MIMETYPE, 
+  EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_GENRE,
   EXTRACTOR_METATYPE_KEYWORDS,
-  EXTRACTOR_METATYPE_SUMMARY, 
+  EXTRACTOR_METATYPE_SUMMARY,
   EXTRACTOR_METATYPE_DESCRIPTION,
   EXTRACTOR_METATYPE_DURATION,
   EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
   EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_CREATOR,
-  EXTRACTOR_METATYPE_WRITER, 
+  EXTRACTOR_METATYPE_WRITER,
   EXTRACTOR_METATYPE_MOVIE_DIRECTOR,
   EXTRACTOR_METATYPE_PRODUCER,
   EXTRACTOR_METATYPE_PUBLISHER,
-  EXTRACTOR_METATYPE_NETWORK_NAME, 
+  EXTRACTOR_METATYPE_NETWORK_NAME,
   EXTRACTOR_METATYPE_SHOW_NAME,
-  EXTRACTOR_METATYPE_CHAPTER_NAME, 
+  EXTRACTOR_METATYPE_CHAPTER_NAME,
   EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST,
-  EXTRACTOR_METATYPE_COPYRIGHT, 
+  EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_URI,
   EXTRACTOR_METATYPE_LOCATION_CITY,
   EXTRACTOR_METATYPE_LOCATION_COUNTRY,
@@ -137,15 +137,15 @@ gint types_video[] =
 };
 
 
-gint types_image[] = 
+gint types_image[] =
 {
-  EXTRACTOR_METATYPE_MIMETYPE, 
+  EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_DESCRIPTION,
   EXTRACTOR_METATYPE_IMAGE_DIMENSIONS,
-  EXTRACTOR_METATYPE_IMAGE_RESOLUTION, 
+  EXTRACTOR_METATYPE_IMAGE_RESOLUTION,
   EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_SUBJECT,
@@ -155,7 +155,7 @@ gint types_image[] =
   EXTRACTOR_METATYPE_LOCATION_CITY,
   EXTRACTOR_METATYPE_LOCATION_COUNTRY,
   EXTRACTOR_METATYPE_LOCATION_COUNTRY_CODE,
-  EXTRACTOR_METATYPE_ORGANIZATION, 
+  EXTRACTOR_METATYPE_ORGANIZATION,
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -171,7 +171,7 @@ gint types_namespace[] =
   EXTRACTOR_METATYPE_RIGHTS,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_ABSTRACT,
-  EXTRACTOR_METATYPE_SUMMARY, 
+  EXTRACTOR_METATYPE_SUMMARY,
   EXTRACTOR_METATYPE_SUBJECT,
   EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_RATING,
@@ -183,17 +183,17 @@ gint types_namespace[] =
 };
 
 
-gint types_software[] = 
-{ 
-  EXTRACTOR_METATYPE_MIMETYPE, 
+gint types_software[] =
+{
+  EXTRACTOR_METATYPE_MIMETYPE,
   EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
-  EXTRACTOR_METATYPE_PACKAGE_NAME, 
+  EXTRACTOR_METATYPE_PACKAGE_NAME,
   EXTRACTOR_METATYPE_PACKAGE_VERSION,
   EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,
   EXTRACTOR_METATYPE_LICENSE,
   EXTRACTOR_METATYPE_TARGET_OS,
-  EXTRACTOR_METATYPE_COMMENT, 
-  EXTRACTOR_METATYPE_SECTION, 
+  EXTRACTOR_METATYPE_COMMENT,
+  EXTRACTOR_METATYPE_SECTION,
   EXTRACTOR_METATYPE_PACKAGE_DEPENDENCY,
   EXTRACTOR_METATYPE_PACKAGE_CONFLICTS,
   EXTRACTOR_METATYPE_PACKAGE_REPLACES,
@@ -205,11 +205,11 @@ gint types_software[] =
   EXTRACTOR_METATYPE_PACKAGE_SOURCE,
   EXTRACTOR_METATYPE_PACKAGE_ESSENTIAL,
   EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY,
-  EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION, 
+  EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION,
   EXTRACTOR_METATYPE_BUILDHOST,
-  EXTRACTOR_METATYPE_VENDOR, 
+  EXTRACTOR_METATYPE_VENDOR,
   EXTRACTOR_METATYPE_SOFTWARE_VERSION,
-  EXTRACTOR_METATYPE_TARGET_PLATFORM, 
+  EXTRACTOR_METATYPE_TARGET_PLATFORM,
   EXTRACTOR_METATYPE_RESOURCE_TYPE,
   EXTRACTOR_METATYPE_LIBRARY_SEARCH_PATH,
   EXTRACTOR_METATYPE_LIBRARY_DEPENDENCY,
@@ -225,12 +225,12 @@ gint types_software[] =
  */
 gint *types[] = {
   types_generic,
-  types_text, 
-  types_music, 
-  types_video, 
+  types_text,
+  types_music,
+  types_video,
   types_image,
-  types_software, 
-  types_namespace, 
+  types_software,
+  types_namespace,
   NULL
 };
 
diff --git a/src/identity/gnunet-identity-gtk.c b/src/identity/gnunet-identity-gtk.c
index 5d3ba622..f201c596 100644
--- a/src/identity/gnunet-identity-gtk.c
+++ b/src/identity/gnunet-identity-gtk.c
@@ -34,7 +34,7 @@
 enum IDENTITY_ModelColumns
   {
     /**
-     * A gchararray 
+     * A gchararray
      */
     IDENTITY_MC_NAME = 0,
 
@@ -80,17 +80,17 @@ struct OperationContext
 
   /**
    * Kept in a DLL.
-   */ 
+   */
   struct OperationContext *next;
 
   /**
    * Kept in a DLL.
-   */ 
+   */
   struct OperationContext *prev;
 
   /**
    * Operation handle with the identity service.
-   */ 
+   */
   struct GNUNET_IDENTITY_Operation *op;
 
 };
@@ -98,12 +98,12 @@ struct OperationContext
 
 /**
  * Head of operations.
- */ 
+ */
 static struct OperationContext *oc_head;
 
 /**
  * Tail of operations.
- */ 
+ */
 static struct OperationContext *oc_tail;
 
 
@@ -134,7 +134,7 @@ get_object (const char *name)
 
 /**
  * Identity operation was finished, clean up.
- * 
+ *
  * @param cls the 'struct OperationContext'
  * @param emsg error message (NULL on success)
  */
@@ -144,7 +144,7 @@ operation_finished (void *cls,
 {
   struct OperationContext *oc = cls;
 
-  GNUNET_CONTAINER_DLL_remove (oc_head, 
+  GNUNET_CONTAINER_DLL_remove (oc_head,
                                oc_tail,
                                oc);
   gtk_widget_set_sensitive (GTK_WIDGET (get_object ("GNUNET_GTK_identity_treeview")),
@@ -168,19 +168,19 @@ struct AdvertisePopupContext
 
 /**
  * "Advertise" was selected in the current context menu.
- * 
+ *
  * @param item the 'advertise' menu item
- * @param user_data the 'struct AdvertisePopupContext' of the menu 
+ * @param user_data the 'struct AdvertisePopupContext' of the menu
  */
 static void
-advertise_ctx_menu (GtkMenuItem *item, 
+advertise_ctx_menu (GtkMenuItem *item,
                     gpointer user_data)
 {
   struct AdvertisePopupContext *apc = user_data;
   const struct GNUNET_CRYPTO_EccPrivateKey *priv;
 
   priv = GNUNET_IDENTITY_ego_get_private_key (apc->ego);
-  GIG_advertise_dialog_start_ (priv);  
+  GIG_advertise_dialog_start_ (priv);
 }
 
 
@@ -188,7 +188,7 @@ advertise_ctx_menu (GtkMenuItem *item,
  * An item was selected from the context menu; destroy the menu shell.
  *
  * @param menushell menu to destroy
- * @param user_data the 'struct AdvertisePopupContext' of the menu 
+ * @param user_data the 'struct AdvertisePopupContext' of the menu
  */
 static void
 advertise_popup_selection_done (GtkMenuShell *menushell,
@@ -212,7 +212,7 @@ advertise_popup_selection_done (GtkMenuShell *menushell,
  *         TRUE if there is now a pop-up menu
  */
 gboolean
-GNUNET_GTK_identity_treeview_button_press_event_cb (GtkWidget *widget, 
+GNUNET_GTK_identity_treeview_button_press_event_cb (GtkWidget *widget,
                                                     GdkEvent *event,
                                                     gpointer user_data)
 {
@@ -232,12 +232,12 @@ GNUNET_GTK_identity_treeview_button_press_event_cb (GtkWidget *widget,
   if (! gtk_tree_view_get_path_at_pos (tv,
                                        event_button->x, event_button->y,
                                        &path, NULL, NULL, NULL))
-    return FALSE; /* click outside of area with values, ignore */    
+    return FALSE; /* click outside of area with values, ignore */
   tm = gtk_tree_view_get_model (tv);
   if (! gtk_tree_model_get_iter (tm, &iter, path))
     {
       gtk_tree_path_free (path);
-      return FALSE; /* not sure how we got a path but no iter... */  
+      return FALSE; /* not sure how we got a path but no iter... */
     }
   gtk_tree_path_free (path);
   gtk_tree_model_get (GTK_TREE_MODEL (ls), &iter,
@@ -258,8 +258,8 @@ GNUNET_GTK_identity_treeview_button_press_event_cb (GtkWidget *widget,
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
   g_signal_connect (menu, "selection-done",
                     G_CALLBACK (advertise_popup_selection_done), apc);
-  gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 
-                  event_button->button, 
+  gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
+                  event_button->button,
                   event_button->time);
   return FALSE;
 }
@@ -289,16 +289,16 @@ GNUNET_GTK_identity_treeview_key_press_event_cb (GtkWidget * widget,
   sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (get_object ("GNUNET_GTK_identity_treeview")));
   if (! gtk_tree_selection_get_selected (sel, NULL, &iter))
     return FALSE;
-  gtk_tree_model_get (GTK_TREE_MODEL (ls), 
-                      &iter, 
+  gtk_tree_model_get (GTK_TREE_MODEL (ls),
+                      &iter,
                       IDENTITY_MC_NAME, &old,
                       -1);
   oc = GNUNET_new (struct OperationContext);
-  GNUNET_CONTAINER_DLL_insert (oc_head, 
+  GNUNET_CONTAINER_DLL_insert (oc_head,
                                oc_tail,
                                oc);
   oc->op = GNUNET_IDENTITY_delete (identity,
-                                   old, 
+                                   old,
                                    &operation_finished,
                                    oc);
   return TRUE;
@@ -314,12 +314,12 @@ GNUNET_GTK_identity_treeview_key_press_event_cb (GtkWidget * widget,
  * @param new_text updated text
  * @param user_data internal context (not used)
  */
-void    
+void
 GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb
 (GtkCellRendererText *renderer,
  gchar *path,
  gchar *new_text,
- gpointer user_data) 
+ gpointer user_data)
 {
   GtkTreePath *treepath;
   GtkTreeIter iter;
@@ -337,15 +337,15 @@ GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb
     return;
   }
   gtk_tree_path_free (treepath);
-  gtk_tree_model_get (GTK_TREE_MODEL (ls), 
-                      &iter, 
+  gtk_tree_model_get (GTK_TREE_MODEL (ls),
+                      &iter,
                       IDENTITY_MC_NAME, &old,
                       IDENTITY_MC_EGO, &ego,
                       -1);
   gtk_widget_set_sensitive (GTK_WIDGET (get_object ("GNUNET_GTK_identity_treeview")),
                             FALSE);
   oc = GNUNET_new (struct OperationContext);
-  GNUNET_CONTAINER_DLL_insert (oc_head, 
+  GNUNET_CONTAINER_DLL_insert (oc_head,
                                oc_tail,
                                oc);
   if (NULL == ego)
@@ -368,11 +368,11 @@ GNUNET_GTK_namespace_organizer_namespaces_treeview_column_name_text_edited_cb
   {
     /* delete operation */
     oc->op = GNUNET_IDENTITY_delete (identity,
-                                     old, 
+                                     old,
                                      &operation_finished,
                                      oc);
   }
-}  
+}
 
 
 /**
@@ -411,7 +411,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Callback invoked if the application is supposed to exit.
  *
- * @param object 
+ * @param object
  * @param user_data unused
  */
 void
@@ -427,7 +427,7 @@ GNUNET_GTK_identity_quit_cb (GObject * object, gpointer user_data)
  *
  * @param cls our 'struct MainPublishingDialogContext'
  * @param ego identity of the namespace to add
- * @param ego_ctx where to store context data 
+ * @param ego_ctx where to store context data
  * @param name name of the namespace to add
  */
 static void
@@ -451,7 +451,7 @@ add_ego (void *cls,
     GNUNET_assert (NULL != name);
     GNUNET_IDENTITY_ego_get_public_key (ego, &pub);
     id = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pub);
-    gtk_list_store_insert_with_values (ls, 
+    gtk_list_store_insert_with_values (ls,
                                        &iter, G_MAXINT,
                                        IDENTITY_MC_NAME, name,
                                        IDENTITY_MC_IDENTIFIER, id,
@@ -460,7 +460,7 @@ add_ego (void *cls,
     GNUNET_free (id);
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (ls),
                                     &iter);
-    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ls), 
+    rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ls),
                                      path);
     gtk_tree_path_free (path);
     *ego_ctx = rr;
@@ -480,13 +480,13 @@ add_ego (void *cls,
   {
     /* rename operation */
     path = gtk_tree_row_reference_get_path (rr);
-    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls), 
+    GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls),
                                             &iter, path));
-    gtk_list_store_set (ls, 
+    gtk_list_store_set (ls,
                         &iter,
                         IDENTITY_MC_NAME, name,
                         -1);
-    gtk_tree_path_free (path);  
+    gtk_tree_path_free (path);
   }
 }
 
@@ -513,7 +513,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   main_window = GTK_WIDGET (get_object ("GNUNET_GTK_identity_window"));
   ls = GTK_LIST_STORE (get_object ("GNUNET_GTK_identity_liststore"));
   GNUNET_assert (NULL != ls);
-  gtk_list_store_insert_with_values (ls, 
+  gtk_list_store_insert_with_values (ls,
                                      &iter, G_MAXINT,
                                      IDENTITY_MC_NAME, "<create>",
                                      -1);
diff --git a/src/identity/gnunet-identity-gtk.h b/src/identity/gnunet-identity-gtk.h
index c3d30b7b..26943ec0 100644
--- a/src/identity/gnunet-identity-gtk.h
+++ b/src/identity/gnunet-identity-gtk.h
@@ -37,4 +37,4 @@ const struct GNUNET_CONFIGURATION_Handle *
 GIG_get_configuration (void);
 
 
-#endif 
+#endif
diff --git a/src/identity/gnunet-identity-gtk_advertise.c b/src/identity/gnunet-identity-gtk_advertise.c
index 07ce5a01..60f8e8ea 100644
--- a/src/identity/gnunet-identity-gtk_advertise.c
+++ b/src/identity/gnunet-identity-gtk_advertise.c
@@ -34,16 +34,16 @@
 /**
  * Types of metadata we offer for namespaces.
  */
-static gint types[] = 
+static gint types[] =
 {
   EXTRACTOR_METATYPE_TITLE,
-  EXTRACTOR_METATYPE_KEYWORDS, 
+  EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_SUBJECT,
   EXTRACTOR_METATYPE_DESCRIPTION,
-  EXTRACTOR_METATYPE_COMMENT, 
+  EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_COPYRIGHT,
-  EXTRACTOR_METATYPE_URI, 
-  EXTRACTOR_METATYPE_CREATOR, 
+  EXTRACTOR_METATYPE_URI,
+  EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_CREATION_DATE,
   EXTRACTOR_METATYPE_RESERVED
 };
@@ -59,17 +59,17 @@ enum METADATA_ModelColumns
    * A guint
    */
   METADATA_MC_TYPE_AS_ENUM = 0,
-  
+
   /**
-   * A gchararray 
+   * A gchararray
    */
   METADATA_MC_TYPE_AS_STRING = 1,
 
   /**
-   * A gchararray 
+   * A gchararray
    */
   METADATA_MC_VALUE = 2
-  
+
 };
 
 
@@ -80,7 +80,7 @@ enum KEYWORDS_ModelColumns
 {
 
   /**
-   * A gchararray 
+   * A gchararray
    */
   KEYWORDS_MC_KEYWORD = 0
 
@@ -94,15 +94,15 @@ enum METATYPES_ModelColumns
 {
 
   /**
-   * A gchararray 
+   * A gchararray
    */
   METATYPES_MC_TYPE_AS_STRING = 0,
-  
+
   /**
    * A guint
    */
   METATYPES_MC_TYPE_AS_ENUM = 1
-  
+
 };
 
 
@@ -115,8 +115,8 @@ struct AdvertiseContext
    * Builder for accessing objects in the dialog.
    */
   GtkBuilder *builder;
-  
-  /** 
+
+  /**
    * Private key of the namespace we will be advertising.
    */
   struct GNUNET_CRYPTO_EccPrivateKey priv;
@@ -125,7 +125,7 @@ struct AdvertiseContext
    * Main dialog object.
    */
   GtkWidget *dialog;
-  
+
   /**
    * List of keywords to advertise under.
    */
@@ -224,7 +224,7 @@ publish_continuation (void *cls,
                       const char *emsg)
 {
   struct PublishContext *pc = cls;
-  
+
   pc->pub = NULL;
   if (NULL == uri)
   {
@@ -291,15 +291,15 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
   const char *id;
 
   if (GTK_RESPONSE_OK != response_id)
-    goto cleanup;  
+    goto cleanup;
   ksk_uri = NULL;
   if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->keywords), &iter))
   {
     GNUNET_break (0);
     goto cleanup;
-  }  
+  }
   do
-  {    
+  {
     gtk_tree_model_get (GTK_TREE_MODEL (ac->keywords), &iter,
                         KEYWORDS_MC_KEYWORD, &keyword,
                         -1);
@@ -310,7 +310,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
     g_free (keyword);
   }
   while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ac->keywords), &iter));
-  
+
   meta = GNUNET_CONTAINER_meta_data_create ();
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->metadata),
                                      &iter))
@@ -323,7 +323,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
                           -1);
       if (ntype > 0)
       {
-        GNUNET_CONTAINER_meta_data_insert (meta, "<user>", 
+        GNUNET_CONTAINER_meta_data_insert (meta, "<user>",
                                            ntype,
                                            EXTRACTOR_METAFORMAT_UTF8,
                                            "text/plain", value,
@@ -335,8 +335,8 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
   }
 
   bo.expiration_time = GNUNET_GTK_get_expiration_time
-    (GTK_SPIN_BUTTON 
-     (gtk_builder_get_object 
+    (GTK_SPIN_BUTTON
+     (gtk_builder_get_object
       (ac->builder,
        "GNUNET_GTK_identity_advertise_expiration_year_spin_button")));
   anonymity = 1;
@@ -346,21 +346,21 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
   bo.anonymity_level = anonymity;
   bo.content_priority
     = (unsigned int) gtk_spin_button_get_value
-    (GTK_SPIN_BUTTON 
-     (gtk_builder_get_object 
+    (GTK_SPIN_BUTTON
+     (gtk_builder_get_object
       (ac->builder,
        "GNUNET_GTK_identity_advertise_priority_spin_button")));
   bo.replication_level
     = (unsigned int) gtk_spin_button_get_value
-    (GTK_SPIN_BUTTON 
-     (gtk_builder_get_object 
+    (GTK_SPIN_BUTTON
+     (gtk_builder_get_object
       (ac->builder,
        "GNUNET_GTK_identity_advertise_replication_spin_button")));
   GNUNET_CRYPTO_ecc_key_get_public_for_signature (&ac->priv,
                                     &pk);
-  id = gtk_entry_get_text 
+  id = gtk_entry_get_text
     (GTK_ENTRY
-     (gtk_builder_get_object 
+     (gtk_builder_get_object
       (ac->builder,
        "GNUNET_GTK_identity_advertise_root_entry")));
   uri = GNUNET_FS_uri_sks_create (&pk, id);
@@ -389,7 +389,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
   GNUNET_free (ac);
 }
 
- 
+
 /**
  * User edited keywords in the keyword tree view.  Update
  * the model accordingly.
@@ -398,7 +398,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
  * @param path the path identifying the edited cell
  * @param new_text the new text
  * @param user_data the 'struct AdvertiseContext'
- */ 
+ */
 void
 GNUNET_GTK_identity_advertise_keywords_text_edited_cb (GtkCellRendererText *renderer,
                                                        gchar               *path,
@@ -454,7 +454,7 @@ GNUNET_GTK_identity_advertise_keywords_text_edited_cb (GtkCellRendererText *rend
     }
   }
   g_free (old_text);
-  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object 
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object
                                         (ac->builder,
                                          "GNUNET_GTK_identity_advertise_ok_button")),
                             0 != ac->num_keywords);
@@ -482,7 +482,7 @@ GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb (GtkWidget *w
 
   if (event->keyval != GDK_KEY_Delete)
     return FALSE;
-  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW 
+  sel = gtk_tree_view_get_selection (GTK_TREE_VIEW
                                      (gtk_builder_get_object
                                       (ac->builder,
                                        "GNUNET_GTK_identity_advertise_metadata_treeview")));
@@ -559,8 +559,8 @@ GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb (GtkEditable *edit
 
   value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder,
                                                    "GNUNET_GTK_identity_advertise_metadata_value_entry"));
-  value = gtk_entry_get_text (value_entry);  
-  add_button = GTK_WIDGET (gtk_builder_get_object (ac->builder, 
+  value = gtk_entry_get_text (value_entry);
+  add_button = GTK_WIDGET (gtk_builder_get_object (ac->builder,
                                                    "GNUNET_GTK_identity_advertise_metadata_add_button"));
   if ( (NULL == value) ||
        (0 == strlen (value)) )
@@ -608,7 +608,7 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button
   type_as_string = EXTRACTOR_metatype_to_string (type);
   value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder,
                                                    "GNUNET_GTK_identity_advertise_metadata_value_entry"));
-  value = gtk_entry_get_text (value_entry);  
+  value = gtk_entry_get_text (value_entry);
   if ( (NULL == value) ||
        (0 == strlen (value)) )
   {
@@ -657,10 +657,10 @@ GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv)
                              (ac->builder, "GNUNET_GTK_identity_advertise_metadata_liststore"));
   ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object
                                    (ac->builder, "GNUNET_GTK_identity_metadata_types_liststore"));
-  for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++)  
+  for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++)
   {
     gtk_list_store_insert_with_values (ac->meta_types,
-                                       &iter, G_MAXINT, 
+                                       &iter, G_MAXINT,
                                        METATYPES_MC_TYPE_AS_STRING,
                                        EXTRACTOR_metatype_to_string (types[i]),
                                        METATYPES_MC_TYPE_AS_ENUM,
diff --git a/src/identity/gnunet-identity-gtk_advertise.h b/src/identity/gnunet-identity-gtk_advertise.h
index 11e44163..5a9dd794 100644
--- a/src/identity/gnunet-identity-gtk_advertise.h
+++ b/src/identity/gnunet-identity-gtk_advertise.h
@@ -45,7 +45,7 @@ GIG_advertise_shutdown_ (void);
 void
 GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv);
 
-#endif 
+#endif
 /* GNUNET_FS_GTK_NAMESPACE_MANAGER_H */
 
 /* end of gnunet-identity-gtk_advertise.h */
diff --git a/src/include/gnunet_gtk.h b/src/include/gnunet_gtk.h
index 98685110..730aacd0 100644
--- a/src/include/gnunet_gtk.h
+++ b/src/include/gnunet_gtk.h
@@ -130,7 +130,7 @@ GNUNET_GTK_display_about (const char *dialogfile);
  * @return TRUE on success, FALSE on errors
  */
 gboolean
-GNUNET_GTK_get_tree_string (GtkTreeView *treeview, 
+GNUNET_GTK_get_tree_string (GtkTreeView *treeview,
                             GtkTreePath *treepath,
                             guint column, gchar ** value);
 
@@ -249,7 +249,7 @@ GNUNET_GTK_main_loop_get_args (struct GNUNET_GTK_MainLoop * ml,
  * FIXME!
  *
  * @param ml FIXME
- * @param data FIXME 
+ * @param data FIXME
  * @return FIXME
  */
 int
@@ -380,7 +380,7 @@ enum GNUNET_GTK_FS_MAIN_WINDOW_AnonymityLevelModelColumns
      * A guint.
      */
     GNUNET_GTK_ANONYMITY_LEVEL_MC_LEVEL = 1,
-    
+
     /**
      * A gchararray.
      */
diff --git a/src/lib/animations.c b/src/lib/animations.c
index ff87f670..7944870a 100644
--- a/src/lib/animations.c
+++ b/src/lib/animations.c
@@ -44,7 +44,7 @@ struct GNUNET_FS_AnimationContext
    * This is a doublye-linked list.
    */
   struct GNUNET_FS_AnimationContext *next;
- 
+
   /**
    * This is a doublye-linked list.
    */
@@ -169,7 +169,7 @@ GNUNET_GTK_animation_context_destroy (struct GNUNET_FS_AnimationContext *ac)
   if (NULL == ac)
     return;
   g_object_unref (ac->pixbuf);
-  g_object_unref (ac->iter); 
+  g_object_unref (ac->iter);
   g_object_unref (ac->ani);
   GNUNET_CONTAINER_DLL_remove (animation_head,
                                animation_tail,
@@ -210,7 +210,7 @@ tick_animation (struct GNUNET_FS_AnimationContext *ac)
   gint height;
 
   if (!gdk_pixbuf_animation_iter_advance (ac->iter, NULL))
-    return 0; 
+    return 0;
   pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (ac->iter);
   width = gdk_pixbuf_get_width (pixbuf);
   height = gdk_pixbuf_get_height (pixbuf);
@@ -227,13 +227,13 @@ tick_animation (struct GNUNET_FS_AnimationContext *ac)
  */
 static void
 redraw_tree_view (struct GNUNET_FS_AnimationTreeViewHandle *atv)
-{  
+{
   GdkWindow *gw;
   GdkRectangle r;
   GdkRectangle tr;
   gint x;
   gint width;
-  
+
   gw = gtk_widget_get_window (GTK_WIDGET (atv->tv));
   if (! gtk_widget_get_realized (GTK_WIDGET (atv->tv)))
     return;
@@ -244,14 +244,14 @@ redraw_tree_view (struct GNUNET_FS_AnimationTreeViewHandle *atv)
   width = r.width;
   gtk_tree_view_convert_bin_window_to_widget_coords (atv->tv, x, 0, &r.x, NULL);
   gtk_tree_view_convert_bin_window_to_widget_coords (atv->tv, x + width, 0, &r.width, NULL);
-  
+
   /* Get visible area of the treeview, in tree coordinates */
   gtk_tree_view_get_visible_rect (atv->tv, &tr);
-  
+
   /* Convert y and height of the visible area to widget coordinates */
   gtk_tree_view_convert_tree_to_widget_coords (atv->tv, 0, tr.y, NULL, &r.y);
   gtk_tree_view_convert_tree_to_widget_coords (atv->tv, 0, tr.y + tr.height, NULL, &r.height);
-  
+
   /* r now encloses only column image_col, redraw it */
   gdk_window_invalidate_rect (gw, &r, TRUE);
 }
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index 3e3972fa..8433a8dc 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -214,7 +214,7 @@ GNUNET_GTK_main_loop_get_builder (struct GNUNET_GTK_MainLoop *ml)
 
 
 int
-GNUNET_GTK_main_loop_build_window (struct GNUNET_GTK_MainLoop *ml, 
+GNUNET_GTK_main_loop_build_window (struct GNUNET_GTK_MainLoop *ml,
                                    gpointer data)
 {
   ml->builder = GNUNET_GTK_get_new_builder (ml->main_window_file, data);
diff --git a/src/lib/glade.c b/src/lib/glade.c
index 5d646ef6..407e23f0 100644
--- a/src/lib/glade.c
+++ b/src/lib/glade.c
@@ -138,7 +138,7 @@ GNUNET_FS_GTK_remove_treestore_subtree (GtkTreeStore * ts,
                                         GtkTreeIter * root)
 {
   GtkTreeIter child;
-  
+
   while (gtk_tree_model_iter_children (GTK_TREE_MODEL (ts), &child, root))
     GNUNET_FS_GTK_remove_treestore_subtree (ts, &child);
   gtk_tree_store_remove (ts, root);
diff --git a/src/lib/misc.c b/src/lib/misc.c
index d52058a3..72d16382 100644
--- a/src/lib/misc.c
+++ b/src/lib/misc.c
@@ -20,7 +20,7 @@
 
 /**
  * @file src/lib/misc.c
- * @brief misc functions 
+ * @brief misc functions
  * @author Christian Grothoff
  */
 #include "gnunet_gtk.h"
diff --git a/src/peerinfo/gnunet-peerinfo-gtk-flags.c b/src/peerinfo/gnunet-peerinfo-gtk-flags.c
index 2bdc054b..215e8a6a 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk-flags.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk-flags.c
@@ -100,7 +100,7 @@ GNUNET_PEERINFO_GTK_get_flag (const char *cc)
   for (i = 0; i < strlen (mcc); i++)
     mcc[i] = tolower (mcc[i]);
   dir = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&fn, "%sflags%s%s.png", dir, 
+  GNUNET_asprintf (&fn, "%sflags%s%s.png", dir,
                    DIR_SEPARATOR_STR, mcc);
   GNUNET_free (dir);
   flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index d4fd1db0..eb068aa0 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -36,7 +36,7 @@
 enum PEERINFO_ModelColumns
   {
     /**
-     * A gchararray 
+     * A gchararray
      */
     PEERINFO_MC_PEER_IDENTITY_STRING = 0,
 
@@ -258,11 +258,11 @@ peer_address_string_cb (void *cls, const char *address)
   {
     /* error */
     if (GNUNET_NO == info->got_address)
-      gtk_list_store_set (ls, &iter, 
-                          PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 1, 
-                          PEERINFO_MC_COUNTRY_NAME, NULL, 
-                          PEERINFO_MC_COUNTRY_FLAG, NULL, 
-                          PEERINFO_MC_ADDRESS_AS_STRING, "<no address>", 
+      gtk_list_store_set (ls, &iter,
+                          PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 1,
+                          PEERINFO_MC_COUNTRY_NAME, NULL,
+                          PEERINFO_MC_COUNTRY_FLAG, NULL,
+                          PEERINFO_MC_ADDRESS_AS_STRING, "<no address>",
                           PEERINFO_MC_CONNECTIVITY_LED, led_green,
                           PEERINFO_MC_CONNECTED_STATUS, TRUE,
                           -1);
@@ -280,11 +280,11 @@ peer_address_string_cb (void *cls, const char *address)
     if ('.' == *dot)
       country = GNUNET_strndup (&dot[1], (colon - dot) - 1);
   }
-  gtk_list_store_set (ls, &iter, 
+  gtk_list_store_set (ls, &iter,
                       PEERINFO_MC_NUMBER_OF_ADDRESSES, 1,
-                      PEERINFO_MC_COUNTRY_NAME, country, 
-                      PEERINFO_MC_COUNTRY_FLAG, GNUNET_PEERINFO_GTK_get_flag (country), 
-                      PEERINFO_MC_ADDRESS_AS_STRING, address, 
+                      PEERINFO_MC_COUNTRY_NAME, country,
+                      PEERINFO_MC_COUNTRY_FLAG, GNUNET_PEERINFO_GTK_get_flag (country),
+                      PEERINFO_MC_ADDRESS_AS_STRING, address,
                       PEERINFO_MC_CONNECTIVITY_LED, led_green,
                       PEERINFO_MC_CONNECTED_STATUS, TRUE,
                       -1);
@@ -315,14 +315,14 @@ peer_address_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
   if (NULL == address)
   {
     /* disconnect */
-    gtk_list_store_set (ls, &iter, 
+    gtk_list_store_set (ls, &iter,
                         PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 0,
                         PEERINFO_MC_CONNECTIVITY_LED, led_red,
                         PEERINFO_MC_CONNECTED_STATUS, FALSE,
                         -1);
     return;
   }
-  gtk_list_store_set (ls, &iter, 
+  gtk_list_store_set (ls, &iter,
                       PEERINFO_MC_NUMBER_OF_ADDRESSES, 1,
                       PEERINFO_MC_CONNECTIVITY_LED, led_green,
                       PEERINFO_MC_CONNECTED_STATUS, TRUE,
@@ -364,8 +364,8 @@ peerinfo_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
     npid = (char *) &enc;
     npid[4] = '\0';
     gtk_list_store_append (ls, &iter);
-    gtk_list_store_set (ls, &iter, 
-                        PEERINFO_MC_PEER_IDENTITY_STRING, npid, 
+    gtk_list_store_set (ls, &iter,
+                        PEERINFO_MC_PEER_IDENTITY_STRING, npid,
                         PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 0,
                         PEERINFO_MC_COUNTRY_NAME, "",
                         PEERINFO_MC_COUNTRY_FLAG, NULL,
@@ -407,7 +407,7 @@ peerinfo_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
  * @param ats_count number of performance records in 'ats'
  */
 static void
-status_cb (void *cls, 
+status_cb (void *cls,
            const struct GNUNET_HELLO_Address *address,
            int address_active,
            struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
@@ -438,7 +438,7 @@ status_cb (void *cls,
 /**
  * Callback invoked if the application is supposed to exit.
  *
- * @param object 
+ * @param object
  * @param user_data unused
  */
 void
@@ -462,7 +462,7 @@ load_led (const char *color)
   char *fn;
 
   dir = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&fn, "%s%s.png", dir, 
+  GNUNET_asprintf (&fn, "%s%s.png", dir,
                    color);
   GNUNET_free (dir);
   pixbuf = gdk_pixbuf_new_from_file (fn, NULL);
@@ -495,7 +495,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_GTK_setup_nls ();
   peer2info = GNUNET_CONTAINER_multihashmap_create (256, GNUNET_NO);
   pnc =
-      GNUNET_PEERINFO_notify (get_configuration (), 
+      GNUNET_PEERINFO_notify (get_configuration (),
                               GNUNET_NO,
                               &peerinfo_processor, NULL);
   if (NULL == pnc)
diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index eb7f821b..d79f650f 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -35,9 +35,9 @@ enum ZoneListColumn
    * A gchararray with the name of the zone for users.
    */
   ZONELIST_COL_NAME = 0,
-  
+
   /**
-   * A gchararray with the name of the configuration file option with 
+   * A gchararray with the name of the configuration file option with
    * the zone key.
    */
   ZONELIST_COL_OPTION = 1
@@ -51,7 +51,7 @@ enum ZoneListColumn
  */
 static void
 edit_dialog_disable_save (struct EditDialogContext *edc)
-{  
+{
   gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                                 "edit_dialog_save_button")),
                             FALSE);
@@ -65,7 +65,7 @@ edit_dialog_disable_save (struct EditDialogContext *edc)
  */
 static void
 edit_dialog_enable_save (struct EditDialogContext *edc)
-{  
+{
   gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                                 "edit_dialog_save_button")),
                             TRUE);
@@ -111,9 +111,9 @@ GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb (GtkToggleButton *but
 {
   struct EditDialogContext *edc = user_data;
 
-  if (gtk_toggle_button_get_active (button))  
+  if (gtk_toggle_button_get_active (button))
     gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-                                                         "edit_dialog_expiration_relative_combobox")));  
+                                                         "edit_dialog_expiration_relative_combobox")));
   else
     gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                          "edit_dialog_expiration_relative_combobox")));
@@ -146,7 +146,7 @@ GNS_edit_dialog_expiration_absolute_radiobutton_toggled_cb (GtkToggleButton *but
 {
   struct EditDialogContext *edc = user_data;
 
-  if (gtk_toggle_button_get_active (button))  
+  if (gtk_toggle_button_get_active (button))
   {
     gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                          "edit_dialog_expiration_absolute_calendar")));
@@ -235,14 +235,14 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
                                      -1 /* position: append */,
                                      0, GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO),
                                      -1);
-  gtk_combo_box_set_active_iter (cb, &iter);    
+  gtk_combo_box_set_active_iter (cb, &iter);
   if ( (! edc->n_is_relative) &&
        (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) )
-  {      
+  {
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                              "edit_dialog_expiration_absolute_radiobutton")),
                                   TRUE);
-    
+
     gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                          "edit_dialog_expiration_relative_combobox")));
     at.abs_value_us = edc->n_exp_time;
@@ -258,7 +258,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
                                               "edit_dialog_expiration_absolute_calendar"));
   gtk_calendar_select_month (cal,
                              ymd->tm_mon,
-                             ymd->tm_year + 1900); 
+                             ymd->tm_year + 1900);
   gtk_calendar_mark_day (cal,
                          ymd->tm_mday);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
@@ -289,7 +289,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
         break;
       g_free (opt);
       opt = NULL;
-    } while (gtk_tree_model_iter_next (tm, &iter));    
+    } while (gtk_tree_model_iter_next (tm, &iter));
   }
   if (NULL != opt)
   {
@@ -302,7 +302,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
 /**
  * Perform the reverse of the 'edit_dialog_setup_common_elements' function,
  * that is, extract the values from the (common) widgets and store the
- * values in 'edc'. 
+ * values in 'edc'.
  *
  * @param edc edit dialog to extract data from
  */
@@ -313,7 +313,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
   struct GNUNET_TIME_Relative rt;
   GtkComboBox *cb;
   GtkTreeModel *tm;
-  GtkTreeIter iter; 
+  GtkTreeIter iter;
   gchar *opt;
 
   /* is public flag */
@@ -322,7 +322,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
   /* is shadow flag */
   edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                               "edit_dialog_options_shadow_checkbutton")));
-  
+
   /* 'forever' expiration time */
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                "edit_dialog_expiration_never_radiobutton"))))
@@ -330,7 +330,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
     edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us;
     edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */
   }
-  
+
   /* 'relative' expiration time */
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                "edit_dialog_expiration_relative_radiobutton"))))
@@ -343,7 +343,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
       GNUNET_break (0);
       return;
     }
-    gtk_tree_model_get (tm, &iter, 
+    gtk_tree_model_get (tm, &iter,
                         0, &rt_s,
                         -1);
     GNUNET_break (GNUNET_YES ==
@@ -365,7 +365,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
     guint second;
     char fancydate[128];
     struct GNUNET_TIME_Absolute atime;
-    
+
     gtk_calendar_get_date (GTK_CALENDAR (gtk_builder_get_object (edc->builder,
                                                                  "edit_dialog_expiration_absolute_calendar")),
                            &year, &month, &day);
@@ -378,8 +378,8 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
     GNUNET_snprintf (fancydate,
                      sizeof (fancydate),
                      "%u-%u-%u %u:%u:%u",
-                     (unsigned int) year, 
-                     (unsigned int) month + 1, 
+                     (unsigned int) year,
+                     (unsigned int) month + 1,
                      (unsigned int) day,
                      (unsigned int) hour,
                      (unsigned int) minute,
@@ -476,7 +476,7 @@ GNS_edit_a_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -524,7 +524,7 @@ GNS_edit_dialog_a (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -585,7 +585,7 @@ GNS_edit_aaaa_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -633,7 +633,7 @@ GNS_edit_dialog_aaaa (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -693,7 +693,7 @@ GNS_edit_cname_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -741,7 +741,7 @@ GNS_edit_dialog_cname (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -801,7 +801,7 @@ GNS_edit_leho_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -849,7 +849,7 @@ GNS_edit_dialog_leho (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -911,7 +911,7 @@ GNS_edit_mx_dialog_response_cb (GtkDialog *dialog,
   const gchar *value;
   char *result;
   unsigned int distance;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -922,8 +922,8 @@ GNS_edit_mx_dialog_response_cb (GtkDialog *dialog,
                                                                                    "edit_dialog_mx_distance_spinbutton")));
     g_free (edc->n_value);
     GNUNET_asprintf (&result,
-                     "%hu,%s", 
-                     distance, 
+                     "%hu,%s",
+                     distance,
                      value);
     edc->n_value = g_strdup (result);
     GNUNET_free (result);
@@ -969,12 +969,12 @@ GNS_edit_dialog_mx (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
   {
-    if (2 != SSCANF(edc->n_value, 
+    if (2 != SSCANF(edc->n_value,
                     "%hu,%253s", &mx_pref, result))
     {
       GNUNET_break (0);
@@ -1042,7 +1042,7 @@ GNS_edit_ns_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1090,7 +1090,7 @@ GNS_edit_dialog_ns (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1126,7 +1126,7 @@ edit_dialog_pkey_validity_check (struct EditDialogContext *edc)
                                                 "edit_dialog_pkey_entry")),
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
-       (GNUNET_OK != 
+       (GNUNET_OK !=
         GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit,
                                                   strlen (preedit),
                                                   &pub)) )
@@ -1154,7 +1154,7 @@ GNS_edit_pkey_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1202,7 +1202,7 @@ GNS_edit_dialog_pkey (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1262,7 +1262,7 @@ GNS_edit_ptr_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1310,7 +1310,7 @@ GNS_edit_dialog_ptr (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1392,7 +1392,7 @@ GNS_edit_soa_dialog_response_cb (GtkDialog *dialog,
   unsigned int soa_expire;
   unsigned int soa_min;
   char *result;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1412,12 +1412,12 @@ GNS_edit_soa_dialog_response_cb (GtkDialog *dialog,
                                                                                      "edit_dialog_soa_expire_time_spinbutton")));
     soa_min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                   "edit_dialog_soa_minimum_ttl_spinbutton")));
-    GNUNET_asprintf (&result, 
+    GNUNET_asprintf (&result,
                      "rname=%s mname=%s %lu,%lu,%lu,%lu,%lu",
                      source_host, contact_email,
-                     soa_serial, 
+                     soa_serial,
                      soa_refresh,
-                     soa_retry, 
+                     soa_retry,
                      soa_expire,
                      soa_min);
     edc->n_value = g_strdup (result);
@@ -1486,12 +1486,12 @@ GNS_edit_dialog_soa (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
   {
-    if (7 != SSCANF (edc->n_value, 
+    if (7 != SSCANF (edc->n_value,
                      "rname=%253s mname=%253s %u,%u,%u,%u,%u",
                      soa_rname, soa_mname,
                      &soa_serial, &soa_refresh, &soa_retry, &soa_expire, &soa_min))
@@ -1582,7 +1582,7 @@ GNS_edit_srv_dialog_response_cb (GtkDialog *dialog,
                                    gpointer user_data)
 {
   struct EditDialogContext *edc = user_data;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1637,7 +1637,7 @@ GNS_edit_dialog_srv (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1688,7 +1688,7 @@ GNS_edit_txt_dialog_response_cb (GtkDialog *dialog,
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
   const gchar *value;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1736,7 +1736,7 @@ GNS_edit_dialog_txt (struct EditDialogContext *edc)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1767,12 +1767,12 @@ edit_dialog_vpn_validity_check (struct EditDialogContext *edc)
   GtkEditable *entry;
   const gchar *preedit;
   struct GNUNET_HashCode hc;
-  
+
   entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
                                                 "edit_dialog_vpn_peer_entry")),
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
-       (GNUNET_OK != 
+       (GNUNET_OK !=
         GNUNET_CRYPTO_hash_from_string (preedit, &hc)) )
   {
     edit_dialog_disable_save (edc);
@@ -1801,7 +1801,7 @@ GNS_edit_vpn_dialog_response_cb (GtkDialog *dialog,
   const gchar *peer;
   unsigned int proto;
   char *result;
-    
+
   if (GTK_RESPONSE_OK == response_id)
   {
     edit_dialog_putes_common_elements (edc);
@@ -1813,7 +1813,7 @@ GNS_edit_vpn_dialog_response_cb (GtkDialog *dialog,
     peer = gtk_entry_get_text (entry);
     proto = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                      "edit_dialog_vpn_protocol_tcp_radiobutton"))) ? IPPROTO_TCP : IPPROTO_UDP;
-    GNUNET_asprintf (&result, 
+    GNUNET_asprintf (&result,
                      "%u %s %s",
                      proto,
                      (const char *) peer,
@@ -1857,14 +1857,14 @@ GNS_edit_dialog_vpn (struct EditDialogContext *edc)
   char s_peer[103 + 1];
   char s_serv[253 + 1];
   unsigned int proto;
- 
+
   edc->builder = GNUNET_GTK_get_new_builder ("gnunet_setup_gns_edit_vpn.glade",
                                              edc);
   if (NULL == edc->builder)
   {
     GNUNET_break (0);
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
-    return;    
+    return;
   }
   if (GNUNET_YES ==
       edc->old_record_in_namestore)
@@ -1885,7 +1885,7 @@ GNS_edit_dialog_vpn (struct EditDialogContext *edc)
       gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
                                                              "edit_dialog_vpn_peer_entry")),
                           s_peer);
-      if (IPPROTO_UDP == proto)      
+      if (IPPROTO_UDP == proto)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                                  "edit_dialog_vpn_protocol_udp_radiobutton")), TRUE);
       else
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 7d62b2a6..2185da3a 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -109,7 +109,7 @@ enum GNSTreestoreColumn
   GNS_TREESTORE_COL_VAL_COLOR,
 
   /**
-   * A gboolean; TRUE if the 'name' column should be shown, 
+   * A gboolean; TRUE if the 'name' column should be shown,
    * FALSE for the lines with the individual records under a name.
    */
   GNS_TREESTORE_COL_NAME_IS_VISIBLE,
@@ -255,7 +255,7 @@ struct MoveOperationContext
  */
 struct RecordInfo
 {
-  
+
   /**
    * Name for this record.
    */
@@ -273,7 +273,7 @@ struct RecordInfo
 
   /**
    * Number of bytes in 'data'.
-   */ 
+   */
   size_t data_size;
 
   /**
@@ -340,12 +340,12 @@ static GtkTreeView *tv;
 
 /**
  * Private key of the zone we are currently editing.
- */ 
+ */
 static struct GNUNET_CRYPTO_EccPrivateKey *pkey;
 
 /**
  * Public key of the zone we are currently editing.
- */ 
+ */
 static struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
 /**
@@ -355,7 +355,7 @@ static char *current_pseudonym;
 
 /**
  * Pointer to name of the configuration option that gives the
- * zone key for the zone we are editing right now.  
+ * zone key for the zone we are editing right now.
  */
 static const char *current_zone_option;
 
@@ -407,7 +407,7 @@ create_qrcode (unsigned int scale)
     return NULL;
   }
   entry = GTK_ENTRY (GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_entry"));
-  pseu = gtk_entry_get_text (GTK_ENTRY(entry));    
+  pseu = gtk_entry_get_text (GTK_ENTRY(entry));
   GNUNET_asprintf (&str,
                    "gnunet://gns/%s/%s\n",
                    GNUNET_NAMESTORE_z2s (&pubkey),
@@ -467,7 +467,7 @@ create_qrcode (unsigned int scale)
 /**
  * Create the QR code image for our zone.
  */
-static void 
+static void
 setup_qrcode ()
 {
   GdkPixbuf *pb;
@@ -511,7 +511,7 @@ GNUNET_setup_qr_save_as_dialog_response_cb (GtkDialog *dialog,
 
   if (GTK_RESPONSE_OK != response_id)
   {
-    gtk_widget_destroy (GTK_WIDGET (dialog));    
+    gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (builder));
     return;
   }
@@ -523,13 +523,13 @@ GNUNET_setup_qr_save_as_dialog_response_cb (GtkDialog *dialog,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Failed to initialize QR-code pixbuf"));
     return;
   }
-  gdk_pixbuf_save (pb, 
+  gdk_pixbuf_save (pb,
                    filename,
                    "png",
                    NULL, NULL);
   g_free (filename);
   g_object_unref (pb);
-  gtk_widget_destroy (GTK_WIDGET (dialog));    
+  gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (builder));
 #else
   GNUNET_break (0);
@@ -552,7 +552,7 @@ GNUNET_setup_gns_qr_saveas_button_clicked_cb (GtkButton *button,
   char *suggestion;
 
   entry = GTK_ENTRY (GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_entry"));
-  pseu = gtk_entry_get_text (GTK_ENTRY(entry));    
+  pseu = gtk_entry_get_text (GTK_ENTRY(entry));
   builder =
     GNUNET_GTK_get_new_builder ("gnunet_setup_qr_save_as_dialog.glade",
                                 NULL);
@@ -563,7 +563,7 @@ GNUNET_setup_gns_qr_saveas_button_clicked_cb (GtkButton *button,
   }
   GNUNET_asprintf (&suggestion,
                    "%s.png",
-                   pseu);  
+                   pseu);
   dialog = GTK_WINDOW (gtk_builder_get_object
                        (builder, "GNUNET_setup_qr_save_as_dialog"));
   gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
@@ -602,7 +602,7 @@ check_record_permitted (unsigned int rd_count,
       return GNUNET_NO;
     case GNUNET_NAMESTORE_TYPE_PKEY:
       return GNUNET_NO;
-    default:      
+    default:
       break;
     }
   }
@@ -613,14 +613,14 @@ check_record_permitted (unsigned int rd_count,
   case GNUNET_DNSPARSER_TYPE_CNAME:
     return GNUNET_NO;
   case GNUNET_DNSPARSER_TYPE_NS:
-    for (i=0;i<rd_count;i++)     
+    for (i=0;i<rd_count;i++)
       if ( (GNUNET_DNSPARSER_TYPE_A != rd[i].record_type) &&
            (GNUNET_DNSPARSER_TYPE_AAAA != rd[i].record_type) )
         return GNUNET_NO;
       return GNUNET_OK;
   case GNUNET_NAMESTORE_TYPE_PKEY:
     return GNUNET_NO;
-  default:      
+  default:
     break;
   }
   return GNUNET_OK;
@@ -634,7 +634,7 @@ check_record_permitted (unsigned int rd_count,
  * @param success GNUNET_OK if the operation succeeded
  * @param emsg error message if the operation failed
  */
-static void 
+static void
 operation_done_cont (void *cls,
                      int32_t success,
                      const char *emsg)
@@ -642,7 +642,7 @@ operation_done_cont (void *cls,
   struct OperationContext *oc = cls;
   GtkWidget *dialog;
   GtkWindow *main_window;
-  
+
   oc->qe = NULL;
   GNUNET_CONTAINER_DLL_remove (oc_head,
                                oc_tail,
@@ -745,7 +745,7 @@ show_error_message (const char *title,
                                               title,
                                               emsg));
   g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-  gtk_widget_show_all (GTK_WIDGET(dialog));  
+  gtk_widget_show_all (GTK_WIDGET(dialog));
 }
 
 
@@ -760,7 +760,7 @@ free_edit_dialog_context (struct EditDialogContext *edc)
   g_free (edc->name);
   g_free (edc->n_value);
   g_free (edc->new_zone_option);
-  GNUNET_free (edc);  
+  GNUNET_free (edc);
 }
 
 
@@ -801,7 +801,7 @@ merge_with_existing_records (void *cls,
   /* FIXME: sanity-check merge... */
   oc = GNUNET_new (struct OperationContext);
   GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-  oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+  oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                            moc->pk,
                                            edc->name,
                                            rd_count + 1,
@@ -849,7 +849,7 @@ decrypt_block_for_merge (void *cls,
 
 
 /**
- * The edit dialog completed; update the namestore and the 
+ * The edit dialog completed; update the namestore and the
  * view based on the new values in 'edc'.
  *
  * @param edc editing context information
@@ -866,7 +866,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
   void *data;
   size_t data_size;
   struct OperationContext *oc;
-    
+
   if ( (NULL != ri) &&
        (GNUNET_OK !=
         GNUNET_NAMESTORE_records_deserialize (ri->data_size,
@@ -884,8 +884,8 @@ edit_dialog_continuation (struct EditDialogContext *edc,
     free_edit_dialog_context (edc);
     return;
   }
-  if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value (edc->record_type, edc->n_value, 
-                                                     &data, &data_size))    
+  if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value (edc->record_type, edc->n_value,
+                                                     &data, &data_size))
   {
     GNUNET_break (0);
     free_edit_dialog_context (edc);
@@ -911,12 +911,12 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       /* remove item from tree view and namestore */
       struct GNUNET_NAMESTORE_RecordData rd_new[rd_count - 1];
 
-      GNUNET_assert (NULL != ri);     
+      GNUNET_assert (NULL != ri);
       memcpy (rd_new, rd_old, (rd_count - 1) * sizeof (struct GNUNET_NAMESTORE_RecordData));
       rd_new[edc->off] = rd_old[rd_count - 1];
       oc = GNUNET_new (struct OperationContext);
       GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-      oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+      oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                                pkey, edc->name,
                                                rd_count + 1,
                                                rd_new,
@@ -942,7 +942,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
         rd_new[edc->off] = rd;
         oc = GNUNET_new (struct OperationContext);
         GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-        oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+        oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                                  pkey, edc->name,
                                                  rd_count,
                                                  rd_new,
@@ -956,7 +956,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
         rd_new[rd_count] = rd;
         oc = GNUNET_new (struct OperationContext);
         GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-        oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+        oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                                  pkey, edc->name,
                                                  rd_count + 1,
                                                  rd_new,
@@ -969,7 +969,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       struct GNUNET_CRYPTO_EccPrivateKey *pk;
       struct MoveOperationContext *moc;
       struct GNUNET_HashCode query;
-      
+
       /* determine target zone */
       if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
                                                                 "gns",
@@ -978,8 +978,8 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       {
         char *emsg;
 
-        GNUNET_asprintf (&emsg, 
-                         _("Option `%s' missing in section `%s'\n"), 
+        GNUNET_asprintf (&emsg,
+                         _("Option `%s' missing in section `%s'\n"),
                          edc->new_zone_option, "gns");
         show_error_message (_("Failed to access key for target zone"),
                             emsg);
@@ -1003,10 +1003,10 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       moc->pk = pk;
       GNUNET_CONTAINER_DLL_insert (moc_head, moc_tail, moc);
 
-      moc->qe = GNUNET_NAMESTORE_lookup_block (namestore, 
+      moc->qe = GNUNET_NAMESTORE_lookup_block (namestore,
                                                &query,
                                                &decrypt_block_for_merge,
-                                               moc);      
+                                               moc);
       /* zone changed, remove record from old zone, add to new zone! */
       if (GNUNET_YES == edc->old_record_in_namestore)
       {
@@ -1018,7 +1018,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
         rd_new[edc->off] = rd_old[rd_count - 1];
         oc = GNUNET_new (struct OperationContext);
         GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-        oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+        oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                                  pkey, edc->name,
                                                  rd_count - 1,
                                                  rd_new,
@@ -1060,7 +1060,7 @@ launch_edit_dialog (gint n_type,
        (off < ri->rd_count) )
   {
     struct GNUNET_NAMESTORE_RecordData rd_old[ri->rd_count];
-    
+
     GNUNET_break (GNUNET_OK ==
                   GNUNET_NAMESTORE_records_deserialize (ri->data_size,
                                                         ri->data,
@@ -1127,7 +1127,7 @@ launch_edit_dialog (gint n_type,
   default:
     GNUNET_break (0);
     edit_dialog_continuation (edc,
-                              GTK_RESPONSE_CANCEL); 
+                              GTK_RESPONSE_CANCEL);
     break;
   }
 }
@@ -1146,7 +1146,7 @@ check_permissions (struct RecordInfo *ri,
                   guint n_type)
 {
   struct GNUNET_NAMESTORE_RecordData rd[ri->rd_count];
-  
+
   GNUNET_break (GNUNET_OK ==
                 GNUNET_NAMESTORE_records_deserialize (ri->data_size,
                                                       ri->data,
@@ -1172,7 +1172,7 @@ check_permissions (struct RecordInfo *ri,
  * selected row.
  *
  * @param widget the GtkTreeView
- * @param user_data main window builder 
+ * @param user_data main window builder
  */
 void
 GNUNET_setup_gns_popup_edit_button_activate_cb (GtkWidget *widget,
@@ -1298,8 +1298,8 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   struct RecordInfo *ri;
   struct GNUNET_HashCode name_hash;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-              "New text for `%s' is `%s'\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "New text for `%s' is `%s'\n",
               path, new_text);
   if ((0 == strcmp (new_text, NEW_NAME_STR)) || (0 == strcmp (new_text, "")))
     return;
@@ -1315,13 +1315,13 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   }
   gtk_tree_model_get_iter_from_string (tm, &it, path);
   gtk_tree_model_get (tm, &it,
-                      GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, 
-                      GNS_TREESTORE_COL_NAME, &name, 
+                      GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy,
+                      GNS_TREESTORE_COL_NAME, &name,
                       -1);
   GNUNET_break (! not_dummy);
   GNUNET_break (0 == strcmp (name, _(NEW_NAME_STR)));
   g_free (name);
-  
+
   GNUNET_CRYPTO_hash (new_text, strlen (new_text), &name_hash);
   ri = GNUNET_CONTAINER_multihashmap_get (n2r,
                                           &name_hash);
@@ -1364,7 +1364,7 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
 
 /**
  * Create a context (popup) menu for the zone iteration treeview
- * (if applicable). 
+ * (if applicable).
  *
  * @return TRUE if a menu was activated
  */
@@ -1429,14 +1429,14 @@ GNUNET_setup_gns_main_treeview_popup_menu_cb (GtkWidget *widget,
  * @return TRUE if a menu was activated (event was handled)
  */
 gboolean
-GNUNET_setup_gns_main_treeview_button_press_event_cb (GtkWidget *widget, 
-                                                      GdkEventButton *event, 
+GNUNET_setup_gns_main_treeview_button_press_event_cb (GtkWidget *widget,
+                                                      GdkEventButton *event,
                                                       gpointer user_data)
 {
   /* Check for right click*/
   if (NULL == widget)
     return FALSE;
-  if ( (GDK_BUTTON_PRESS == event->type) && 
+  if ( (GDK_BUTTON_PRESS == event->type) &&
        (3 == event->button) )
     return create_popup_menu ();
   return FALSE;
@@ -1453,8 +1453,8 @@ GNUNET_setup_gns_main_treeview_button_press_event_cb (GtkWidget *widget,
  * @return TRUE if the key was processed ('del')
  */
 gboolean
-GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget, 
-                                                   GdkEventKey *event, 
+GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
+                                                   GdkEventKey *event,
                                                    gpointer user_data)
 {
   GtkTreeIter iter;
@@ -1468,13 +1468,13 @@ GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
 
   /* Check for delete key */
   if ( (GDK_KEY_PRESS != event->type) ||
-       (GDK_KEY_Delete != event->keyval) ) 
+       (GDK_KEY_Delete != event->keyval) )
     return FALSE;
   sel = gtk_tree_view_get_selection(tv);
   if (! gtk_tree_selection_get_selected (sel, NULL, &iter))
-    return TRUE; /* nothing selected */  
-  gtk_tree_model_get (tm, &iter, 
-                      GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, 
+    return TRUE; /* nothing selected */
+  gtk_tree_model_get (tm, &iter,
+                      GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy,
                       GNS_TREESTORE_COL_NAME, &name,
                       -1);
   if (GNUNET_NO == not_dummy)
@@ -1486,7 +1486,7 @@ GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
   ri = GNUNET_CONTAINER_multihashmap_get (n2r,
                                           &name_hash);
   GNUNET_assert (NULL != ri);
-  
+
   if ( (gtk_tree_model_iter_parent (tm, &parent, &iter)) &&
        (ri->rd_count > 0) )
   {
@@ -1503,7 +1503,7 @@ GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
 
     /* Removing a single record */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Removing single record for name `%s'\n", 
+                "Removing single record for name `%s'\n",
                 name);
     GNUNET_break (GNUNET_OK ==
                   GNUNET_NAMESTORE_records_deserialize (ri->data_size,
@@ -1549,7 +1549,7 @@ GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
     rd_new[off] = rd_old[ri->rd_count - 1];
     oc = GNUNET_new (struct OperationContext);
     GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-    oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+    oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                              pkey, name,
                                              ri->rd_count - 1,
                                              rd_new,
@@ -1560,7 +1560,7 @@ GNUNET_setup_gns_main_treeview_key_press_event_cb (GtkWidget *widget,
   {
     oc = GNUNET_new (struct OperationContext);
     GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-    oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
+    oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                              pkey, name,
                                              0, NULL,
                                              &operation_done_cont, oc);
@@ -1604,7 +1604,7 @@ GNUNET_setup_gns_pseu_entry_changed_cb (GtkEditable *editable,
                         current_pseudonym);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "New Pseudonym is `%s' %u\n",
               pseu);
   GNUNET_free_non_null (current_pseudonym);
@@ -1642,11 +1642,11 @@ GNUNET_setup_gns_pseu_entry_changed_cb (GtkEditable *editable,
     if (off == rd_count)
       total++;
     if ( (NULL == pseu) ||
-         (0 == strlen (pseu)) )    
+         (0 == strlen (pseu)) )
     {
       rd_new[off] = rd_new[rd_count - 1];
       total--;
-    } 
+    }
     else
     {
       rd_new[off].record_type = GNUNET_NAMESTORE_TYPE_PSEU;
@@ -1657,8 +1657,8 @@ GNUNET_setup_gns_pseu_entry_changed_cb (GtkEditable *editable,
     }
     oc = GNUNET_new (struct OperationContext);
     GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
-    oc->qe = GNUNET_NAMESTORE_records_store (namestore, 
-                                             pkey, 
+    oc->qe = GNUNET_NAMESTORE_records_store (namestore,
+                                             pkey,
                                              GNUNET_GNS_MASTERZONE_STR,
                                              total,
                                              rd_new,
@@ -1686,7 +1686,7 @@ GNUNET_setup_gns_public_key_copy_button_clicked_cb (GtkButton *button,
   if (NULL == pkey)
     return;
   cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-  gtk_clipboard_set_text (cb, 
+  gtk_clipboard_set_text (cb,
                           GNUNET_NAMESTORE_z2s (&pubkey),
                           -1);
 }
@@ -1701,8 +1701,8 @@ GNUNET_setup_gns_public_key_copy_button_clicked_cb (GtkButton *button,
 static void
 zone_sync_proc (void *cls)
 {
-  if (0 == strcmp (current_zone_option, "ZONEKEY"))    
-    gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_hbox")));    
+  if (0 == strcmp (current_zone_option, "ZONEKEY"))
+    gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_hbox")));
 #if HAVE_QRENCODE_H
   setup_qrcode ();
   gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_qr_image")));
@@ -1721,7 +1721,7 @@ zone_sync_proc (void *cls)
 
 /**
  * Function called for each record in the current zone.  Update the
- * widgets accordingly. 
+ * widgets accordingly.
  *
  * @param cls NULL
  * @param zone_key private key of the zone
@@ -1769,7 +1769,7 @@ zone_iteration_proc (void *cls,
                 name);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Zone iteration result `%s', %u records\n",
               name, rd_count);
   GNUNET_CRYPTO_hash (name,
@@ -1807,7 +1807,7 @@ zone_iteration_proc (void *cls,
                         GNS_TREESTORE_COL_TYPE_IS_EDITABLE, TRUE,
                         GNS_TREESTORE_COL_RECORD_OFFSET, UINT_MAX,
                         -1);
-    
+
     path = gtk_tree_model_get_path (tm,
                                     &iter_name);
     rr = gtk_tree_row_reference_new (tm,
@@ -1825,7 +1825,7 @@ zone_iteration_proc (void *cls,
   {
     /* all records removed, remove name as well */
     gtk_tree_store_remove (ts, &iter_name);
-    GNUNET_assert (GNUNET_YES == 
+    GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multihashmap_remove (n2r, &name_hash, ri));
     gtk_tree_row_reference_free (rr);
     GNUNET_free (ri->name);
@@ -1856,7 +1856,7 @@ zone_iteration_proc (void *cls,
     public = ((rd[c].flags & GNUNET_NAMESTORE_RF_PRIVATE) != GNUNET_NAMESTORE_RF_PRIVATE);
     /* Expiration time */
     time_is_relative = (0 != (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
-    
+
     if (time_is_relative)
     {
       struct GNUNET_TIME_Relative rel_time;
@@ -1885,7 +1885,7 @@ zone_iteration_proc (void *cls,
     else
       GNUNET_asprintf (&type_str, "%s", EXPIRE_INVALID_STRING);
 
-    if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) && 
+    if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) &&
          (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) &&
          (NULL == current_pseudonym) )
     {
@@ -1907,8 +1907,8 @@ zone_iteration_proc (void *cls,
                                        GNS_TREESTORE_COL_VAL_AS_STR, val,
                                        GNS_TREESTORE_COL_IS_RECORD_ROW, TRUE,
                                        GNS_TREESTORE_COL_NOT_DUMMY_ROW, TRUE,
-                                       GNS_TREESTORE_COL_RECORD_OFFSET, (guint) c,                                    
-                                       -1);    
+                                       GNS_TREESTORE_COL_RECORD_OFFSET, (guint) c,                              
+                                       -1);
     GNUNET_free (type_str);
     GNUNET_free (val);
   }
@@ -1921,7 +1921,7 @@ zone_iteration_proc (void *cls,
 }
 
 
-/** 
+/**
  * Method called to inform about the egos of this peer.  Called
  * when we are doing a #load_zone operation and are getting the
  * private key of the new zone to edit.
@@ -1931,7 +1931,7 @@ zone_iteration_proc (void *cls,
  * @a ego does indicate an error (i.e. name is taken or no default
  * value is known).  If @a ego is non-NULL and if '*ctx'
  * is set in those callbacks, the value WILL be passed to a subsequent
- * call to the identity callback of #GNUNET_IDENTITY_connect (if 
+ * call to the identity callback of #GNUNET_IDENTITY_connect (if
  * that one was not NULL).
  *
  * @param cls closure with the 'const char *' zonename
@@ -1957,8 +1957,8 @@ identity_cb (void *cls,
   /* setup crypto keys */
   if (NULL == ego)
   {
-    GNUNET_asprintf (&emsg, 
-                     _("Default zone for `%s' not set; did you run gnunet-gns-import.sh?\n"), 
+    GNUNET_asprintf (&emsg,
+                     _("Default zone for `%s' not set; did you run gnunet-gns-import.sh?\n"),
                      zonename);
     show_error_message (_("Failed to load zone"),
                         emsg);
@@ -2035,7 +2035,7 @@ load_zone (const char *zonename)
  * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
  * @param user_data builder, unused
  */
-void 
+void
 GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                 gpointer user_data)
 {
@@ -2051,7 +2051,7 @@ GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb (GtkToggleButton
  * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
  * @param user_data builder, unused
  */
-void 
+void
 GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                 gpointer user_data)
 {
@@ -2067,7 +2067,7 @@ GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb (GtkToggleButton
  * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
  * @param user_data builder, unused
  */
-void 
+void
 GNUNET_setup_gns_master_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                gpointer user_data)
 {
@@ -2092,13 +2092,13 @@ GNUNET_SETUP_gns_init ()
     status_label = GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label"));
     label = g_markup_printf_escaped (_("<b><big>Failed to connect to namestore</b></big>"));
     gtk_label_set_markup (status_label, label);
-    g_free (label);                       
+    g_free (label);                     
     return;
   }
   identity = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
   ts = GTK_TREE_STORE (GNUNET_SETUP_get_object ("GNUNET_setup_gns_treestore"));
   tv = GTK_TREE_VIEW (GNUNET_SETUP_get_object ("GNUNET_setup_gns_main_treeview"));
-  tm = GTK_TREE_MODEL (ts);  
+  tm = GTK_TREE_MODEL (ts);
   n2r = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
   load_zone ("gns-master");
 }
diff --git a/src/setup/gnunet-setup-hostlist-server.c b/src/setup/gnunet-setup-hostlist-server.c
index 122f8b7b..91411405 100644
--- a/src/setup/gnunet-setup-hostlist-server.c
+++ b/src/setup/gnunet-setup-hostlist-server.c
@@ -59,7 +59,7 @@ struct CommandContext
    * Where to pass the result.
    */
   TestHostlistDaemonCallback callback;
-  
+
   /**
    * Closure for the callback.
    */
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 4b5c52b7..45a400d6 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1386,7 +1386,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    &save_number, NULL,
    NULL, NULL,
    NULL},
-   
+
   {
    "GNUNET_setup_transport_udp_advertised_port_spinbutton",
    "value-changed",
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 40193f34..08cc39d9 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -89,7 +89,7 @@ enum AutoPhase
    * Last phase, we're done.
    */
   AUTO_DONE
-  
+
 };
 
 
@@ -108,12 +108,12 @@ struct GNUNET_SetupAutoContext
    * Function to call when done.
    */
   GNUNET_SetupAutoConfigFinished fin_cb;
-  
+
   /**
    * Closure for 'fin_cb'.
    */
   void *fin_cb_cls;
-  
+
   /**
    * Handle for active 'GNUNET_NAT_mini_get_external_ipv4'-operation.
    */
@@ -178,12 +178,12 @@ result_callback (void *cls, int success)
   GNUNET_NAT_test_stop (ac->tst);
   ac->tst = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              success 
+              success
               ? _("NAT traversal with ICMP Server succeeded.\n")
               : _("NAT traversal with ICMP Server failed.\n"));
   update_icmp_server_enable_button (success);
   if (NULL != cfg)
-    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", 
+    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER",
                                            success ? "YES": "NO");
   next_phase (ac);
 }
@@ -373,7 +373,7 @@ nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
 
 
 /**
- * Determine our local IP addresses; detect internal IP & IPv6-support 
+ * Determine our local IP addresses; detect internal IP & IPv6-support
  *
  * @param ac auto setup context
  */
@@ -389,7 +389,7 @@ test_local_ip (struct GNUNET_SetupAutoContext *ac)
   gtk_toggle_button_set_active (button,
                                 (GNUNET_YES == have_v6) ? FALSE : TRUE);
   if (NULL != cfg)
-    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6", 
+    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6",
                                            (GNUNET_YES == have_v6) ? "NO" : "YES");
   next_phase (ac);
 }
@@ -426,7 +426,7 @@ test_upnpc (struct GNUNET_SetupAutoContext *ac)
   /* FIXME: test if upnpc is actually working, that is, if transports
      start to work once we use UPnP */
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              (have_upnpc) 
+              (have_upnpc)
               ? _("upnpc found, enabling its use\n")
               : _("upnpc not found\n"));
   gtk_toggle_button_set_active (button,
@@ -434,7 +434,7 @@ test_upnpc (struct GNUNET_SetupAutoContext *ac)
                                 ? TRUE
                                 : FALSE);
   if (NULL != cfg)
-    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP", 
+    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP",
                                            (GNUNET_YES == have_upnpc) ? "YES" : "NO");
   next_phase (ac);
 }
@@ -465,7 +465,7 @@ test_icmp_server (struct GNUNET_SetupAutoContext *ac)
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              (hns) 
+              (hns)
               ? _("gnunet-helper-nat-server found, testing it\n")
               : _("No working gnunet-helper-nat-server found\n"));
   if (hns)
@@ -501,7 +501,7 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              (hnc) 
+              (hnc)
               ? _("gnunet-helper-nat-client found, enabling it\n")
               : _("gnunet-helper-nat-client not found or behind NAT, disabling it\n"));
   button =
@@ -517,7 +517,7 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
  *
  * @param fin_cb function to call when done
  * @param fin_cb_cls closure for 'fin_cb'
- * @return handle for the operation 
+ * @return handle for the operation
  */
 struct GNUNET_SetupAutoContext *
 GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
@@ -530,8 +530,8 @@ GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
   ac->fin_cb_cls = fin_cb_cls;
 
   /* never use loopback addresses if user wanted autoconfiguration */
-  GNUNET_CONFIGURATION_set_value_string (cfg, "nat", 
-                                         "USE_LOCALADDR", 
+  GNUNET_CONFIGURATION_set_value_string (cfg, "nat",
+                                         "USE_LOCALADDR",
                                          "NO");
   next_phase (ac);
   return ac;
@@ -608,7 +608,7 @@ GNUNET_setup_transport_autoconfig_button_clicked_cb ()
   if (NULL != ac)
   {
     GNUNET_break (0);
-    return; 
+    return;
   }
   gtk_widget_set_sensitive (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_autoconfig_button")),
                             FALSE);
diff --git a/src/setup/gnunet-setup-transport.h b/src/setup/gnunet-setup-transport.h
index d7cc8b90..e8b6bd37 100644
--- a/src/setup/gnunet-setup-transport.h
+++ b/src/setup/gnunet-setup-transport.h
@@ -48,7 +48,7 @@ typedef void (*GNUNET_SetupAutoConfigFinished)(void *cls);
  *
  * @param fin_cb function to call when done
  * @param fin_cb_cls closure for 'fin_cb'
- * @return handle for the operation 
+ * @return handle for the operation
  */
 struct GNUNET_SetupAutoContext *
 GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 6a4aee80..d50cf39a 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -84,7 +84,7 @@ static int do_gksu;
  * Show all configuration options, even if we are run
  * as a normal user and a 'gnunet' user exists and thus
  * most options should not apply to the normal user.
- */ 
+ */
 static int force_full_setup;
 #endif
 
@@ -136,7 +136,7 @@ void
 GNUNET_setup_notebook_switch_page_cb (GtkNotebook *notebook,
                                       GtkWidget   *page,
                                       guint        page_num,
-                                      gpointer     user_data) 
+                                      gpointer     user_data)
 {
   GtkWidget *help;
   GtkWidget *gnu;
@@ -146,7 +146,7 @@ GNUNET_setup_notebook_switch_page_cb (GtkNotebook *notebook,
   if (gnu == page)
     gtk_widget_hide (help);
   else
-    gtk_widget_show (help);  
+    gtk_widget_show (help);
 }
 
 
@@ -260,7 +260,7 @@ load_options ()
   GObject *widget;
   char *value;
 
-#ifndef LINUX 
+#ifndef LINUX
   gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_hijack_checkbutton")));
 #endif
   i = 0;
@@ -340,7 +340,7 @@ load_options ()
  *
  * @return GNUNET_OK on success
  */
-static int 
+static int
 write_configuration ()
 {
   struct GNUNET_CONFIGURATION_Handle *cfgDefault;
@@ -398,7 +398,7 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Write configuration to dis, (re)start the namestore process and
  * reload the namestore models.
- * 
+ *
  *
  * @param cls closure (unused)
  * @param tc scheduler context (unused)
@@ -540,7 +540,7 @@ try_gksu (const char *username)
 
 /**
  * Called once the autoconfiguration is done.  Triggers shutdown.
- * 
+ *
  * @param cls unused
  */
 static void
@@ -576,7 +576,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_GTK_main_loop_quit (cls);
     return;
   }
-#endif  
+#endif
 
   ml = cls;
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
@@ -584,8 +584,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
-  
-#ifndef MINGW  
+
+#ifndef MINGW
   if ( (0 != my_uid) &&
        (NULL != gnunet_pw) &&
        (my_uid != gnunet_pw->pw_uid) &&
diff --git a/src/setup/gnunet-setup.h b/src/setup/gnunet-setup.h
index cf23d474..d99f29d3 100644
--- a/src/setup/gnunet-setup.h
+++ b/src/setup/gnunet-setup.h
@@ -39,7 +39,7 @@
 enum GNUNET_GTK_SETUP_HostlistUrlModelColumns
   {
     /**
-     * A gchararray 
+     * A gchararray
      */
     GNUNET_GTK_SETUP_HOSTLIST_URL_MC_URL = 0,
 
@@ -56,10 +56,10 @@ enum GNUNET_GTK_SETUP_HostlistUrlModelColumns
 enum GNUNET_GTK_SETUP_GnsModelColumns
   {
     /**
-     * A gchararray 
+     * A gchararray
      */
     GNUNET_GTK_SETUP_GNS_MC_HOSTNAME = 0,
-      
+
     /**
      * A guint
      */
@@ -71,12 +71,12 @@ enum GNUNET_GTK_SETUP_GnsModelColumns
     GNUNET_GTK_SETUP_GNS_MC_TARGETPORT = 2,
 
     /**
-     * A gchararray 
+     * A gchararray
      */
     GNUNET_GTK_SETUP_GNS_MC_TARGETHOSTNAME = 3,
 
     /**
-     * A gchararray 
+     * A gchararray
      */
     GNUNET_GTK_SETUP_GNS_MC_ISUDP = 4,
   };
@@ -95,7 +95,7 @@ GNUNET_SETUP_get_object (const char *name);
 /**
  * Write configuration to dis, (re)start the namestore process and
  * reload the namestore models.
- * 
+ *
  *
  * @param cls closure (unused)
  * @param tc scheduler context (unused)