-more doxygen fixes

12 files changed, 47 insertions, 33 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index e1261256..bb7ea15a 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -208,6 +208,8 @@ main_window_save_position (GtkWidget *main_window)
  * and saves these into user's config file.
  *
  * @param main_window main window widget
+ * @param event the event that we are handling
+ * @param user_data main window context
  */
 gboolean
 GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
@@ -302,6 +304,7 @@ GNUNET_FS_GTK_menu_quit_activate_cb (GtkMenuItem *object,
  * Callback invoked if the application is supposed to exit.
  *
  * @param object origin of the quit event, unused
+ * @param event the delete event
  * @param user_data global builder instance, unused
  */
 void
diff --git a/src/fs/gnunet-fs-gtk_about.c b/src/fs/gnunet-fs-gtk_about.c
index e2950b31..e23b6694 100644
--- a/src/fs/gnunet-fs-gtk_about.c
+++ b/src/fs/gnunet-fs-gtk_about.c
@@ -31,7 +31,7 @@
 /**
  * This displays an about window
  *
- * @param widget widget creating the event, unused
+ * @param dummy widget creating the event, unused
  * @param data global builder, unused
  */
 void
diff --git a/src/fs/gnunet-fs-gtk_anonymity-widgets.c b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
index e52f8a1b..9b6c21ab 100644
--- a/src/fs/gnunet-fs-gtk_anonymity-widgets.c
+++ b/src/fs/gnunet-fs-gtk_anonymity-widgets.c
@@ -28,12 +28,13 @@
 #include "gnunet-fs-gtk_anonymity-widgets.h"
 #include <gdk/gdk.h>
 
+
 /**
  * Spin button is changed, update its color.  NOTE: This function will eventually
  * become obsolete as we migrate to the drop-down style of anonymity-level selection.
  *
  * @param w the spin button that changed
- * @param builder's closure, unused
+ * @param data the builder's closure, unused
  */
 void
 GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget * w, gpointer data)
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index c8570833..f0746883 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -35,11 +35,11 @@
  * (returns NULL for everything else).
  * Verifies UTF-8 strings.
  *
- * @param format format of the @data
+ * @param format format of the @a data
  * @param data data to convert
- * @param data_len length of the data buffer (in bytes)
+ * @param data_len length of the @a data buffer (in bytes)
  * @return NULL if can't be converted, allocated string otherwise,
- *         freeable with GNUNET_free* ().
+ *         freeable with #GNUNET_free.
  */
 char *
 GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
@@ -82,7 +82,7 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
  *
  * @param cls closure (the GtkListStore)
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (i.e. '\<zlib\>' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
@@ -90,7 +90,7 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
  * @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
+ * @param data_len number of bytes in @a data
  * @return 0 to continue (always)
  */
 int
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index a50367e5..53990378 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -60,7 +60,7 @@ GNUNET_FS_GTK_setup_expiration_year_adjustment (GtkBuilder * builder);
  * time (on midnight, January 1st of that year).
  *
  * @param spin button with the year
- * @param time converted from the spin button
+ * @return time converted from the spin button
  */
 struct GNUNET_TIME_Absolute
 GNUNET_FS_GTK_get_expiration_time (GtkSpinButton * spin);
@@ -86,7 +86,7 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
  *
  * @param cls closure (the GtkListStore)
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (i.e. '\<zlib\>' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
@@ -94,7 +94,7 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
  * @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
+ * @param data_len number of bytes in @a data
  * @return 0 to continue (always)
  */
 int
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index de01865e..06a9a42d 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -1106,7 +1106,9 @@ populate_popup_with_sks_items (void *cls,
  *
  * @param tm tree model underlying the tree view where the event happened
  * @param tab tab where the event happened
- * @param event_button the event
+ * @param init_button which button triggered the popup, or 0 for none
+ * @param event_time at what time was the popup triggered
+ * @param iter location in the tree model selected at the time
  * @return FALSE if no menu could be popped up,
  *         TRUE if there is now a pop-up menu
  */
@@ -2750,7 +2752,7 @@ struct AddDirectoryEntryContext
   
   /**
    * Do we need to check if the given entry already exists to
-   * avoid adding it twice?  Set to YES if 'add_directory_entry'
+   * avoid adding it twice?  Set to #GNUNET_YES if #add_directory_entry
    * is called upon directory completion (so we might see all
    * entries again) and to NO if this is the initial download
    * and we're calling during a 'PROGRESS' event.
@@ -2774,14 +2776,14 @@ struct AddDirectoryEntryContext
  * @param cls closure, our 'struct AddDirectoryEntryContext*'
  * @param filename name of the file in the directory
  * @param uri URI of the file, NULL for the directory itself
- * @param metadata metadata for the file; metadata for
+ * @param meta metadata for the file; metadata for
  *        the directory if everything else is NULL/zero
  * @param length length of the available data for the file
  *           (of type size_t since data must certainly fit
  *            into memory; if files are larger than size_t
  *            permits, then they will certainly not be
  *            embedded with the directory itself).
- * @param data data available for the file (length bytes)
+ * @param data data available for the file (@a length bytes)
  */
 static void
 add_directory_entry (void *cls, const char *filename,
@@ -2847,7 +2849,7 @@ add_directory_entry (void *cls, const char *filename,
  * @param completed number of bytes we have completed
  * @param block_data current block we've downloaded
  * @param offset offset of block_data in the overall file
- * @param block_size number of bytes in block_data
+ * @param block_size number of bytes in @a block_data
  * @param depth depth of the block in the ECRS tree
  */
 static void
@@ -3583,7 +3585,9 @@ copy_publish_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
  *
  * @param tm tree model underlying the tree view where the event happened
  * @param tab tab where the event happened
- * @param event_button the event
+ * @param init_button number of the button that triggered the popup
+ * @param event_time GTK time when the event was generated
+ * @param iter selected element in @a tm for the popup
  * @return FALSE if no menu could be popped up,
  *         TRUE if there is now a pop-up menu
  */
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 8724d20c..308b2582 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
@@ -152,6 +152,7 @@ do_metadata_popup_menu (int button,
  * If it was a right click, pop up the context menu.
  *
  * @param widget the tree view widget
+ * @param event the button press event
  * @param user_data the gtk builder of the main window
  */
 gboolean
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 fea122ea..af87e932 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,8 @@
  * @param toggle_menu name of menu entry
  */
 static void
-toggle_view (const char *toggled_widget, const char *toggle_menu)
+toggle_view (const char *toggled_widget, 
+             const char *toggle_menu)
 {
   GtkCheckMenuItem *mi;
   GtkWidget *widget;
@@ -53,10 +54,11 @@ toggle_view (const char *toggled_widget, const char *toggle_menu)
  * Preview view is toggled.
  *
  * @param dummy widget triggering the event
- * @param gpointer main window builder (unused)
+ * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy, gpointer data)
+GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy, 
+                                              gpointer data)
 {
   toggle_view ("GNUNET_GTK_main_window_preview_image",
                "GNUNET_GTK_main_menu_view_preview");
@@ -67,23 +69,26 @@ GNUNET_GTK_main_menu_view_preview_toggled_cb (GtkWidget * dummy, gpointer data)
  * Metadata view is toggled.
  *
  * @param dummy widget triggering the event
- * @param gpointer main window builder (unused)
+ * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy, gpointer data)
+GNUNET_GTK_main_menu_view_metadata_toggled_cb (GtkWidget * dummy, 
+                                               gpointer data)
 {
   toggle_view ("GNUNET_GTK_main_window_metadata_treeview",
                "GNUNET_GTK_main_menu_view_metadata");
 }
 
+
 /**
  * Preview view is toggled.
  *
  * @param dummy widget triggering the event
- * @param gpointer main window builder (unused)
+ * @param data main window builder (unused)
  */
 void
-GNUNET_GTK_main_menu_view_search_toggled_cb (GtkWidget * dummy, gpointer data)
+GNUNET_GTK_main_menu_view_search_toggled_cb (GtkWidget * dummy, 
+                                             gpointer data)
 {
   toggle_view ("main_window_search_hbox",
                "GNUNET_GTK_main_menu_search_preview");
diff --git a/src/fs/gnunet-fs-gtk_open-directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index 7cefe7af..ae05b2e2 100644
--- a/src/fs/gnunet-fs-gtk_open-directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -56,14 +56,14 @@ struct AddChildContext
  * @param cls closure, our 'struct AddChildContext*'
  * @param filename name of the file in the directory
  * @param uri URI of the file
- * @param metadata metadata for the file; metadata for
+ * @param meta metadata for the file; metadata for
  *        the directory if everything else is NULL/zero
  * @param length length of the available data for the file
  *           (of type size_t since data must certainly fit
  *            into memory; if files are larger than size_t
  *            permits, then they will certainly not be
  *            embedded with the directory itself).
- * @param data data available for the file (length bytes)
+ * @param data data available for the file (@a length bytes)
  */
 static void
 add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
@@ -140,7 +140,7 @@ GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog *dialog,
  * file and then display a new tab with its contents.
  *
  * @param dummy the menu entry
- * @param user_data the main dialog builder, unused
+ * @param data the main dialog builder, unused
  */
 void
 GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 8335ba4a..6d4cca18 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1288,7 +1288,7 @@ GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb (GtkButton *button,
  *
  * @param widget the widget emitting the event
  * @param event the event
- * @param user_data progress dialog context of our window
+ * @param cls progress dialog context of our window
  * @return TRUE to refuse to close
  */
 gboolean
@@ -2336,7 +2336,7 @@ GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton * button,
  * allowed and if so, close it.
  *
  * @param widget the widget that generated the close event
- * @param even the close event
+ * @param event the close event
  * @param user_data master publishing dialog context of our window
  * @return TRUE to refuse to close (stops other handlers from being invoked)
  *         FALSE to allow closing the window
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 22d6e6ed..d717779f 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -553,7 +553,7 @@ GNUNET_GTK_edit_publication_add_button_clicked_cb (GtkButton * button,
  * The user has pushed the 'del' button for metadata.
  * If there is a metadata selected, remove it from the list store.
  *
- * @param widget the button
+ * @param button the delete button
  * @param user_data the 'struct EditPublicationDialogContext'
  */
 void
@@ -667,7 +667,7 @@ update_confirm_sensitivity (struct EditPublicationDialogContext *ctx)
  * The user has pushed the 'del' button for the keyword.
  * If there is a keyword selected, remove it from the list store.
  *
- * @param widget the button
+ * @param button the button
  * @param user_data the 'struct EditPublicationDialogContext'
  */
 void
@@ -697,7 +697,7 @@ GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb (GtkButton *
  * The user has pushed the 'add' button for the keyword (or pressed RETURN).
  * If there is a keyword in the line, add it to the list store.
  *
- * @param widget the entry line, or NULL (if we are called from 'RETURN')
+ * @param button the add button, or NULL (if we are called from 'RETURN')
  * @param user_data the 'struct EditPublicationDialogContext'
  */
 void
@@ -802,7 +802,7 @@ GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
  *        field and the liststore to check the current value
  *        against in 'meta_liststore'.
  * @param plugin_name name of the plugin that produced this value;
- *        special values can be used (i.e. '<zlib>' for zlib being
+ *        special values can be used (i.e. '\<zlib\>' for zlib being
  *        used in the main libextractor library and yielding
  *        meta data).
  * @param type libextractor-type describing the meta data
diff --git a/src/fs/gnunet-fs-gtk_unindex.c b/src/fs/gnunet-fs-gtk_unindex.c
index 83236142..a4fc4c61 100644
--- a/src/fs/gnunet-fs-gtk_unindex.c
+++ b/src/fs/gnunet-fs-gtk_unindex.c
@@ -379,7 +379,7 @@ add_indexed_file (void *cls, const char *filename,
  * User selected "List indexed files..." in menu.  Display dialog.
  *
  * @param dummy the menu entry
- * @param user_data the main dialog builder, unused
+ * @param data the main dialog builder, unused
  */
 void
 GNUNET_GTK_main_menu_unindex_activate_cb (GtkWidget * dummy,