-mionor code cleanup

3 files changed, 21 insertions, 13 deletions

diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 0a13e59d..9d8ba188 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -106,13 +106,13 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
 
 
 /**
- * Converts metadata specified by @data of size @data_len
- * and saved in format @format to UTF-8 encoded string.
+ * Converts metadata specified by #data of size #data_len
+ * and saved in format #format to UTF-8 encoded string.
  * Works only for C-string and UTF8 metadata formats
  * (returns NULL for everything else).
  * Verifies UTF-8 strings.
  *
- * @param format format of the @data
+ * @param format format of the #data
  * @param data data to convert
  * @param data_len length of the data buffer (in bytes)
  * @return NULL if can't be converted, allocated string otherwise,
@@ -174,6 +174,7 @@ GNUNET_GTK_find_largest_namespace_rating (void);
 void
 GNUNET_GTK_set_largest_namespace_rating (int new_value);
 
+
 /**
  * Converts a GtkTreeRowReference to a GtkTreeIter.
  *
@@ -182,7 +183,9 @@ GNUNET_GTK_set_largest_namespace_rating (int new_value);
  * @return GNUNET_OK if iter was filled, GNUNET_SYSERR otherwise
  */
 int
-GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, GtkTreeIter *iter);
+GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, 
+                                    GtkTreeIter *iter);
+
 
 /**
  * Creates a GtkTreeRowReference from a GtkTreeIter.
@@ -192,7 +195,9 @@ GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, GtkTreeIter *iter);
  * @return newly created reference or NULL in case of error
  */
 GtkTreeRowReference *
-GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter);
+GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, 
+                                    GtkTreeIter *iter);
+
 
 /**
  * Fills "next_iter" with iterator for an item that comes next in the tree
@@ -213,7 +218,10 @@ GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter);
  */
 gboolean
 GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model,
-    GtkTreeIter *iter, gboolean allow_children, GtkTreeIter *next_iter);
+                                          GtkTreeIter *iter, 
+                                          gboolean allow_children, 
+                                          GtkTreeIter *next_iter);
+
 
 #endif
 /* end of gnunet-fs-gtk-common.h */
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index f33daa3a..84df8dc2 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -198,7 +198,7 @@ open_saveas_dialog (struct DownloadEntry *de, int download_directly)
   GtkWidget *cb;
   GtkWidget *hb;
 
-  dlc = GNUNET_malloc (sizeof (struct DownloadAsDialogContext));
+  dlc = GNUNET_new (struct DownloadAsDialogContext);
   dlc->de = de;
   dlc->download_directly = download_directly;
   dlc->builder =
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 786f0fe2..46ac1f63 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet
-     (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2005-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -84,7 +84,7 @@ enum PUBLISH_MetadataTypesModelColumns
     /**
      * A gchararray.
      */
-    PUBLISH_METADATA_TYPES_MC_DESCRIPTION = 3,
+    PUBLISH_METADATA_TYPES_MC_DESCRIPTION = 3
   };
 
 
@@ -101,7 +101,7 @@ enum PUBLISH_TypesModelColumns
     /**
      * A gchararray.
      */
-    PUBLISH_TYPES_MC_TYPE_NAME = 1,
+    PUBLISH_TYPES_MC_TYPE_NAME = 1
   };
 
 
@@ -118,7 +118,7 @@ enum PUBLISH_KeywordsModelColumns
     /**
      * A gboolean.
      */
-    PUBLISH_TYPES_MC_ADDED = 1,
+    PUBLISH_TYPES_MC_ADDED = 1
   };