diff -r cc123f0d84af -r 00f876b129bc pidgin/gtksmiley.h
--- a/pidgin/gtksmiley.h	Fri Jan 31 17:56:27 2014 +0530
+++ b/pidgin/gtksmiley.h	Fri Jan 31 18:14:33 2014 +0530
@@ -37,14 +37,14 @@
  * Add a PurpleSmiley to the GtkIMHtmlSmiley's list to be able to use it
  * in pidgin
  *
- * @param smiley	The smiley to be added.
+ * @smiley:	The smiley to be added.
  */
 void pidgin_smiley_add_to_list(PurpleSmiley *smiley);
 
 /**
  * Delete a PurpleSmiley from the GtkIMHtmlSmiley's list
  *
- * @param smiley	The smiley to be deleted.
+ * @smiley:	The smiley to be deleted.
  */
 void pidgin_smiley_del_from_list(PurpleSmiley *smiley);
 
@@ -61,7 +61,7 @@
 /**
  * Returns a GSList with the GtkIMHtmlSmiley of each custom smiley
  *
- * @constreturn A GtkIMHmlSmiley list
+ * Returns: (TODO const): A GtkIMHmlSmiley list
  */
 GSList *pidgin_smileys_get_all(void);
 
@@ -76,9 +76,9 @@
 /**
  * Shows an editor for a smiley.
  *
- * @param widget The parent widget to be linked or @c NULL
- * @param smiley The PurpleSmiley to be edited, or @c NULL for a new smiley
- * @return The smiley add dialog
+ * @widget: The parent widget to be linked or %NULL
+ * @smiley: The PurpleSmiley to be edited, or %NULL for a new smiley
+ * Returns: The smiley add dialog
  *
  * @see pidgin_smiley_editor_set_shortcut
  * @see pidgin_smiley_editor_set_image
@@ -88,25 +88,25 @@
 /**
  * Set the shortcut in a smiley add dialog
  *
- * @param editor A smiley editor dialog (created by pidgin_smiley_edit)
- * @param shortcut The shortcut to set
+ * @editor: A smiley editor dialog (created by pidgin_smiley_edit)
+ * @shortcut: The shortcut to set
  */
 void pidgin_smiley_editor_set_shortcut(PidginSmiley *editor, const gchar *shortcut);
 
 /**
  * Set the image in a smiley add dialog
  *
- * @param editor A smiley editor dialog
- * @param image A GdkPixbuf image
+ * @editor: A smiley editor dialog
+ * @image: A GdkPixbuf image
  */
 void pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image);
 
 /**
  * Sets the image data in a smiley add dialog
  *
- * @param editor A smiley editor dialog
- * @param data A pointer to smiley's data
- * @param datasize The size of smiley's data
+ * @editor: A smiley editor dialog
+ * @data: A pointer to smiley's data
+ * @datasize: The size of smiley's data
  */
 void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize);