# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1121901033 0
# Node ID f2755f58a7da7b5463941fad94b1a720788cbe19
# Parent  f78e7e982cf4828a24e0815e7868547b744e4b89
[gaim-migrate @ 13196]
Straighten out some comments and get rid of a warning in gtkutils.c

committer: Tailor Script <tailor@pidgin.im>

diff -r f78e7e982cf4 -r f2755f58a7da src/gtkutils.c
--- a/src/gtkutils.c	Wed Jul 20 22:46:41 2005 +0000
+++ b/src/gtkutils.c	Wed Jul 20 23:10:33 2005 +0000
@@ -1457,7 +1457,7 @@
 {
 	GList *tmp;
 	GdkPixbuf *pb;
-	GList *files = gaim_uri_list_extract_filenames(sd->data);
+	GList *files = gaim_uri_list_extract_filenames((const gchar *)sd->data);
 	GaimConnection *gc = gaim_account_get_connection(account);
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	gboolean file_send_ok = FALSE;
diff -r f78e7e982cf4 -r f2755f58a7da src/util.c
--- a/src/util.c	Wed Jul 20 22:46:41 2005 +0000
+++ b/src/util.c	Wed Jul 20 23:10:33 2005 +0000
@@ -3170,8 +3170,10 @@
 	return ((c - domain) > 3 ? TRUE : FALSE);
 }
 
-/** Stolen from gnome_uri_list_extract_uris **/
-GList* gaim_uri_list_extract_uris (const gchar* uri_list) {
+/* Stolen from gnome_uri_list_extract_uris */
+GList *
+gaim_uri_list_extract_uris(const gchar *uri_list)
+{
 	const gchar *p, *q;
 	gchar *retval;
 	GList *result = NULL;
@@ -3215,13 +3217,15 @@
 }
 
 
-/** Stolen from gaim_uri_list_extract_filenames **/
-GList* gaim_uri_list_extract_filenames (const gchar* uri_list) {
+/* Stolen from gnome_uri_list_extract_filenames */
+GList *
+gaim_uri_list_extract_filenames(const gchar *uri_list)
+{
 	GList *tmp_list, *node, *result;
 
 	g_return_val_if_fail (uri_list != NULL, NULL);
 
-	result = gaim_uri_list_extract_uris (uri_list);
+	result = gaim_uri_list_extract_uris(uri_list);
 
 	tmp_list = result;
 	while (tmp_list) {
diff -r f78e7e982cf4 -r f2755f58a7da src/util.h
--- a/src/util.h	Wed Jul 20 22:46:41 2005 +0000
+++ b/src/util.h	Wed Jul 20 23:10:33 2005 +0000
@@ -132,7 +132,7 @@
  *                know you'll be able to use strlen to
  *                determine the length, etc.
  *
- * @return The raw data.  Must be g'free'd when no longer needed.
+ * @return The raw data.  Must be g_free'd when no longer needed.
  */
 guint8 *gaim_quotedp_decode(const char *str, gsize *ret_len);
 
@@ -150,15 +150,19 @@
  * of an encoded word is =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?=
  * =? designates the beginning of the encoded-word
  * ?= designates the end of the encoded-word
- * ? segments the encoded word into three pieces.  The first piece is
- *   the character set, the second piece is the encoding, and the
- *   third piece is the encoded text.
+ *
+ * An encoded word is segmented into three pieces by the use of a
+ * question mark.  The first piece is the character set, the second
+ * piece is the encoding, and the third piece is the encoded text.
  *
- * @param str The string to convert back.
+ * @param str The ASCII string, possibly containing any number of
+ *            encoded-word sections.
  *
- * @return The readable string.
+ * @return The string, with any encoded-word sections decoded and
+ *         converted to UTF-8.  Must be g_free'd when no longer
+ *         needed.
  */
-char *gaim_mime_decode_field (const char *str);
+char *gaim_mime_decode_field(const char *str);
 
 /*@}*/
 
@@ -222,6 +226,9 @@
  *
  * This function just calls strftime. The only advantage to using it
  * is that gcc won't give a warning if you use %c
+ *
+ * TODO: The warning is gone in gcc4, and this function can
+ *       eventually be removed.
  */
 size_t gaim_strftime(char *s, size_t max, const char *format, const struct tm *tm);
 
@@ -234,7 +241,7 @@
 /*@{*/
 
 /**
- * Finds a HTML tag matching the given name.
+ * Finds an HTML tag matching the given name.
  *
  * This locates an HTML tag's start and end, and stores its attributes
  * in a GData hash table. The names of the attributes are lower-cased
@@ -714,27 +721,29 @@
 gboolean gaim_email_is_valid(const char *address);
 
 /**
- * This function extracts a list of URIs from the a "text/uri-list" string
- * It was "borrowed" from gnome_uri_list_extract_uris
- * 
- * @param uri_list an uri-list in the standard format.
+ * This function extracts a list of URIs from the a "text/uri-list"
+ * string.  It was "borrowed" from gnome_uri_list_extract_uris
+ *
+ * @param uri_list An uri-list in the standard format.
  *
- * @return a GList containing strings allocated with g_malloc that have been 
- *	splitted from uri-list.
+ * @return A GList containing strings allocated with g_malloc
+ *         that have been splitted from uri-list.
  */
-GList* gaim_uri_list_extract_uris (const gchar* uri_list);
+GList *gaim_uri_list_extract_uris(const gchar *uri_list);
 
 /**
- * This function extracts a list of filenames from the a "text/uri-list" string
- * It was "borrowed" from gnome_uri_list_extract_filenames
- * 
- * @param uri_list an uri-list in the standard format.
+ * This function extracts a list of filenames from a
+ * "text/uri-list" string.  It was "borrowed" from
+ * gnome_uri_list_extract_filenames
+ *
+ * @param uri_list A uri-list in the standard format.
  *
- * @return a GList containing strings allocated with g_malloc that contain the 
- * 	filenames in the uri-list. Note that unlike gaim_uri_list_extract_uris() 
- * 	function, this will discard any non-file uri from the result value.
+ * @return A GList containing strings allocated with g_malloc that
+ *         contain the filenames in the uri-list. Note that unlike
+ *         gaim_uri_list_extract_uris() function, this will discard
+ *         any non-file uri from the result value.
  */
-GList* gaim_uri_list_extract_filenames (const gchar* uri_list);
+GList *gaim_uri_list_extract_filenames(const gchar *uri_list);
 
 /*@}*/