1 files changed, 5 insertions, 4 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index cba115ab..36ad03e0 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -145,7 +145,7 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
      call the handler manually */
   GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL,
                                              user_data);
-  /* FIXME: isn't the dialog going to be destroyed with the builder? 
+  /* FIXME-BUG-MAYBE: isn't the dialog going to be destroyed with the builder? 
      Is this legal and/or required? */
   gtk_widget_destroy (GTK_WIDGET (dialog));
 }
@@ -189,7 +189,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
                                 dc->is_recursive);   
 
   /* initialize filename based on filename from 'dc' */
-  if (dc->filename != NULL)
+  if (NULL != dc->filename)
   {
     char *dirname;
     char *basename;
@@ -200,6 +200,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
     if (basename > dirname)
       basename[-1] = '\0';
 
+    /* FIXME: remove following lines after testing... */
     fprintf (stderr,
              "Splitting `%s' into `%s' + `%s' for file chooser dialog.\n",
              dc->filename,
@@ -237,7 +238,7 @@ GNUNET_FS_GTK_download_context_start_download (struct DownloadContext *dc)
   dc->uri = NULL;
   de->meta = dc->meta;
   dc->meta = NULL;
-  if (dc->rr != NULL)
+  if (NULL != dc->rr)
   {
     de->rr = gtk_tree_row_reference_copy (dc->rr);
     de->ts = GTK_TREE_STORE (gtk_tree_row_reference_get_model (dc->rr));
@@ -268,7 +269,7 @@ GNUNET_FS_GTK_download_context_start_download (struct DownloadContext *dc)
   if (dc->is_recursive)
     opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
   len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
-  if (dc->sr != NULL)
+  if (NULL != dc->sr)
   {
     GNUNET_break (NULL !=
                   GNUNET_FS_download_start_from_search (fs, dc->sr,