** Remove a bunch of juvenile comments. Source code should look

2009-04-12  Matthew Barnes  <mbarnes@redhat.com>

	** Remove a bunch of juvenile comments.  Source code should
	   look professional, even if some developers are not.


svn path=/trunk/; revision=10204

19 files changed, 556 insertions, 507 deletions

diff --git a/ChangeLog b/ChangeLog
index 4110d08..4dda332 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Remove a bunch of juvenile comments.  Source code should
+	   look professional, even if some developers are not.
+
 2009-04-07  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #574522
diff --git a/addressbook/libebook/e-name-western.c b/addressbook/libebook/e-name-western.c
index 407aee2..be4ef0f 100644
--- a/addressbook/libebook/e-name-western.c
+++ b/addressbook/libebook/e-name-western.c
@@ -105,9 +105,6 @@ e_name_western_get_words_at_idx (char *str, int idx, int num_words)
 	return g_string_free (words, FALSE);
 }
 
-/*
- * What the fuck is wrong with glib's MAX macro.
- */
 static int
 e_name_western_max (const int a, const int b)
 {
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index f9c6f08..4ecc07c 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -1271,24 +1271,24 @@ search_header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv
 }
 
 /* this is just to OR results together */
-struct _glib_sux_donkeys {
+struct IterData {
 	int count;
 	GPtrArray *uids;
 };
 
 /* or, store all unique values */
 static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
+htor(char *key, int value, struct IterData *iter_data)
 {
-	g_ptr_array_add(fuckup->uids, key);
+	g_ptr_array_add(iter_data->uids, key);
 }
 
 /* and, only store duplicates */
 static void
-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)
+htand(char *key, int value, struct IterData *iter_data)
 {
-	if (value == fuckup->count)
-		g_ptr_array_add(fuckup->uids, key);
+	if (value == iter_data->count)
+		g_ptr_array_add(iter_data->uids, key);
 }
 
 static int
@@ -1333,7 +1333,7 @@ match_words_index(CamelFolderSearch *search, struct _camel_search_words *words,
 {
 	GPtrArray *result = g_ptr_array_new();
 	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
+	struct IterData lambdafoo;
 	CamelIndexCursor *wc, *nc;
 	const char *word, *name;
 	int i;
@@ -1363,7 +1363,7 @@ match_words_index(CamelFolderSearch *search, struct _camel_search_words *words,
 
 		lambdafoo.uids = result;
 		lambdafoo.count = (1<<words->len) - 1;
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &lambdafoo);
+		g_hash_table_foreach(ht, (GHFunc)htand, &lambdafoo);
 		g_hash_table_destroy(ht);
 	}
 
@@ -1480,7 +1480,7 @@ search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, Cam
 	CamelException *ex = search->priv->ex;
 	struct _camel_search_words *words;
 	ESExpResult *r;
-	struct _glib_sux_donkeys lambdafoo;
+	struct IterData lambdafoo;
 
 	if (search->current) {	
 		int truth = FALSE;
@@ -1537,7 +1537,7 @@ search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, Cam
 				}
 			}
 			lambdafoo.uids = r->value.ptrarray;
-			g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
+			g_hash_table_foreach(ht, (GHFunc)htor, &lambdafoo);
 			g_hash_table_destroy(ht);
 		}
 	}
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index deae25d..29c092e 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -193,7 +193,6 @@ static CamelDListNode *camel_dlist_remove(CamelDListNode *n)
 }
 
 
-/* fucking glib... */
 static const char *
 e_strdown (char *str)
 {
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 2d7e68f..8544853 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -40,7 +40,7 @@
 
 #define d(x)
 
-/* dunno where this fucking thing is got from */
+/* dunno where this thing is got from */
 /* see also camel-lock.c */
 #define _(x) (x)
 
@@ -138,7 +138,6 @@ static int camel_lock_helper_init(CamelException *ex)
 		for (i=3;i<255;i++)
 			     close(i);
 		execl(CAMEL_LIBEXECDIR "/camel-lock-helper-" API_VERSION, "camel-lock-helper", NULL);
-		d(fprintf(stderr, "shit, couldn't exec lock helper!\n"));
 		/* it'll pick this up when it tries to use us */
 		exit(255);
 	default:
diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h
index 6925bec..22a2d82 100644
--- a/camel/camel-mime-filter-tohtml.h
+++ b/camel/camel-mime-filter-tohtml.h
@@ -68,7 +68,7 @@ CamelType        camel_mime_filter_tohtml_get_type (void);
 CamelMimeFilter *camel_mime_filter_tohtml_new (guint32 flags, guint32 colour);
 
 
-/* utility functions to replace e_text_to_html shit */
+/* utility functions to replace e_text_to_html */
 
 char *camel_text_to_html (const char *in, guint32 flags, guint32 colour);
 
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 1946e7d..d24bb19 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -94,7 +94,7 @@ camel_mime_part_construct_content_from_parser (CamelMimePart *dw, CamelMimeParse
 	switch (camel_mime_parser_state (mp)) {
 	case CAMEL_MIME_PARSER_STATE_HEADER:
 		d(printf("Creating body part\n"));
-		/* multipart/signed is some fucked up type that we must treat as binary data, fun huh, idiots. */
+		/* multipart/signed is some type that we must treat as binary data. */
 		if (camel_content_type_is (ct, "multipart", "signed")) {
 			content = (CamelDataWrapper *) camel_multipart_signed_new ();
 			camel_multipart_construct_from_parser ((CamelMultipart *) content, mp);
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index b65062e..2ea0e9f 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3683,7 +3683,6 @@ static unsigned char camel_datetok_table[256] = {
 	111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
 };
 
-/* hrm, is there a library for this shit? */
 static struct {
 	char *name;
 	int offset;
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index cc36ffa..e068933 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -327,8 +327,9 @@ camel_imap_folder_selected (CamelFolder *folder, CamelImapResponse *response,
 		} else if (!g_ascii_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {
 			resp += 19;
 			
-			/* workaround for broken IMAP servers that send "* OK [PERMANENTFLAGS ()] Permanent flags"
-			 * even tho they do allow storing flags. *Sigh* So many fucking broken IMAP servers out there. */
+			/* workaround for broken IMAP servers that send
+			 * "* OK [PERMANENTFLAGS ()] Permanent flags"
+			 * even tho they do allow storing flags. */
 			imap_parse_flag_list (&resp, &perm_flags, NULL);
 			if (perm_flags != 0)
 				folder->permanent_flags = perm_flags;
@@ -3515,8 +3516,6 @@ imap_update_summary (CamelFolder *folder, int exists,
 			}
 			
 			if (pmi == NULL) {
-				/* Server response is *really* fucked up,
-				   I guess we just pretend it never happened? */
 				continue;
 			}
 			
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 79c794f..3927031 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -3000,8 +3000,6 @@ camel_imap_store_connected (CamelImapStore *store, CamelException *ex)
 }
 
 
-/* FIXME: please god, when will the hurting stop? Thus function is so
-   fucking broken it's not even funny. */
 ssize_t
 camel_imap_store_readline (CamelImapStore *store, char **dest, CamelException *ex)
 {
diff --git a/camel/providers/imap4/camel-imap4-command.c b/camel/providers/imap4/camel-imap4-command.c
index c26a362..b812f69 100644
--- a/camel/providers/imap4/camel-imap4-command.c
+++ b/camel/providers/imap4/camel-imap4-command.c
@@ -678,7 +678,6 @@ camel_imap4_command_step (CamelIMAP4Command *ic)
 			
 		unexpected:
 			
-			/* no fucking clue what we got... */
 			if (camel_imap4_engine_line (engine, &linebuf, &len, &ic->ex) == -1)
 				goto exception;
 			
diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c
index 7aa5b9c..7a57d9f 100644
--- a/camel/providers/imap4/camel-imap4-summary.c
+++ b/camel/providers/imap4/camel-imap4-summary.c
@@ -753,7 +753,7 @@ imap4_fetch_all_free (struct imap4_fetch_all_t *fetch)
 }
 
 static void
-courier_imap_is_a_piece_of_shit (CamelFolderSummary *summary, guint32 msg)
+courier_imap_show_error (CamelFolderSummary *summary, guint32 msg)
 {
 	CamelSession *session = ((CamelService *) summary->folder->parent_store)->session;
 	char *warning;
@@ -791,7 +791,7 @@ imap4_fetch_all_add (struct imap4_fetch_all_t *fetch, gboolean complete)
 	for (i = 0; i < fetch->added->len; i++) {
 		if (!(envelope = fetch->added->pdata[i])) {
 			if (complete)
-				courier_imap_is_a_piece_of_shit (fetch->summary, i + fetch->first);
+				courier_imap_show_error (fetch->summary, i + fetch->first);
 			break;
 		}
 		
@@ -883,7 +883,7 @@ imap4_fetch_all_update (struct imap4_fetch_all_t *fetch)
 	
 	for (i = 0; i < fetch->added->len; i++) {
 		if (!(envelope = fetch->added->pdata[i])) {
-			courier_imap_is_a_piece_of_shit (fetch->summary, i + fetch->first);
+			courier_imap_show_error (fetch->summary, i + fetch->first);
 			continue;
 		}
 		
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index bc35600..3ecbfeb 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -47,7 +47,7 @@ enum {
 typedef struct _CamelMaildirMessageInfo {
 	CamelLocalMessageInfo info;
 
-	char *filename;		/* maildir has this annoying status shit on the end of the filename, use this to get the real message id */
+	char *filename;		/* maildir has this annoying status on the end of the filename, use this to get the real message id */
 } CamelMaildirMessageInfo;
 
 struct _CamelMaildirSummary {
diff --git a/docs/reference/camel/tmpl/camel-arg.sgml b/docs/reference/camel/tmpl/camel-arg.sgml
index cf3bfff..a1ad38c 100644
--- a/docs/reference/camel/tmpl/camel-arg.sgml
+++ b/docs/reference/camel/tmpl/camel-arg.sgml
@@ -29,12 +29,16 @@ camel-arg
 
 </para>
 
+@ap: 
+@argc: 
+@argv: 
 
 <!-- ##### STRUCT CamelArgGet ##### -->
 <para>
 
 </para>
 
+@tag: 
 
 <!-- ##### STRUCT CamelArgGetV ##### -->
 <para>
@@ -45,6 +49,48 @@ camel-arg
 @argc: 
 @argv: 
 
+<!-- ##### MACRO ca_object ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ca_int ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ca_double ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ca_str ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO ca_ptr ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAMEL_ARGV_MAX ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO camel_argv_start ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-object.sgml b/docs/reference/camel/tmpl/camel-object.sgml
index 1725376..34a8441 100644
--- a/docs/reference/camel/tmpl/camel-object.sgml
+++ b/docs/reference/camel/tmpl/camel-object.sgml
@@ -204,6 +204,480 @@ CamelObject
 
 @CAMEL_OBJECT_DESTROY: 
 
+<!-- ##### FUNCTION camel_type_init ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION camel_type_register ##### -->
+<para>
+
+</para>
+
+@parent: 
+@name: 
+@instance_size: 
+@classfuncs_size: 
+@class_init: 
+@class_finalize: 
+@instance_init: 
+@instance_finalize: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_interface_register ##### -->
+<para>
+
+</para>
+
+@parent: 
+@name: 
+@classfuncs_size: 
+@class_init: 
+@class_finalize: 
+@Returns: 
+
+
+<!-- ##### MACRO camel_type_get_global_classfuncs ##### -->
+<para>
+
+</para>
+
+@x: 
+
+
+<!-- ##### FUNCTION camel_type_to_name ##### -->
+<para>
+
+</para>
+
+@type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_name_to_type ##### -->
+<para>
+
+</para>
+
+@name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_class_add_event ##### -->
+<para>
+
+</para>
+
+@klass: 
+@name: 
+@prep: 
+
+
+<!-- ##### FUNCTION camel_object_class_add_interface ##### -->
+<para>
+
+</para>
+
+@klass: 
+@itype: 
+
+
+<!-- ##### FUNCTION camel_object_class_dump_tree ##### -->
+<para>
+
+</para>
+
+@root: 
+
+
+<!-- ##### FUNCTION camel_object_cast ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_is ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_class_cast ##### -->
+<para>
+
+</para>
+
+@klass: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_class_is ##### -->
+<para>
+
+</para>
+
+@klass: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_interface_cast ##### -->
+<para>
+
+</para>
+
+@klass: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_interface_is ##### -->
+<para>
+
+</para>
+
+@k: 
+@ctype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_new ##### -->
+<para>
+
+</para>
+
+@type: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_ref ##### -->
+<para>
+
+</para>
+
+@Param1: 
+
+
+<!-- ##### FUNCTION camel_object_unref ##### -->
+<para>
+
+</para>
+
+@Param1: 
+
+
+<!-- ##### FUNCTION camel_object_hook_event ##### -->
+<para>
+
+</para>
+
+@obj: 
+@name: 
+@hook: 
+@data: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_remove_event ##### -->
+<para>
+
+</para>
+
+@obj: 
+@id: 
+
+
+<!-- ##### FUNCTION camel_object_unhook_event ##### -->
+<para>
+
+</para>
+
+@obj: 
+@name: 
+@hook: 
+@data: 
+
+
+<!-- ##### FUNCTION camel_object_trigger_event ##### -->
+<para>
+
+</para>
+
+@obj: 
+@name: 
+@event_data: 
+
+
+<!-- ##### FUNCTION camel_object_get_interface ##### -->
+<para>
+
+</para>
+
+@vo: 
+@itype: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_set ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ex: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_setv ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ex: 
+@Param3: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_get ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ex: 
+@Varargs: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_getv ##### -->
+<para>
+
+</para>
+
+@obj: 
+@ex: 
+@Param3: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_get_ptr ##### -->
+<para>
+
+</para>
+
+@vo: 
+@ex: 
+@tag: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_get_int ##### -->
+<para>
+
+</para>
+
+@vo: 
+@ex: 
+@tag: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_meta_get ##### -->
+<para>
+
+</para>
+
+@vo: 
+@name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_meta_set ##### -->
+<para>
+
+</para>
+
+@vo: 
+@name: 
+@value: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_state_read ##### -->
+<para>
+
+</para>
+
+@vo: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_state_write ##### -->
+<para>
+
+</para>
+
+@vo: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_free ##### -->
+<para>
+
+</para>
+
+@vo: 
+@tag: 
+@value: 
+
+
+<!-- ##### STRUCT CamelObjectBag ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION CamelCopyFunc ##### -->
+<para>
+
+</para>
+
+@vo: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_new ##### -->
+<para>
+
+</para>
+
+@hash: 
+@equal: 
+@keycopy: 
+@keyfree: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_get ##### -->
+<para>
+
+</para>
+
+@bag: 
+@key: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_peek ##### -->
+<para>
+
+</para>
+
+@bag: 
+@key: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_reserve ##### -->
+<para>
+
+</para>
+
+@bag: 
+@key: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_add ##### -->
+<para>
+
+</para>
+
+@bag: 
+@key: 
+@vo: 
+
+
+<!-- ##### FUNCTION camel_object_bag_abort ##### -->
+<para>
+
+</para>
+
+@bag: 
+@key: 
+
+
+<!-- ##### FUNCTION camel_object_bag_rekey ##### -->
+<para>
+
+</para>
+
+@bag: 
+@o: 
+@newkey: 
+
+
+<!-- ##### FUNCTION camel_object_bag_list ##### -->
+<para>
+
+</para>
+
+@bag: 
+@Returns: 
+
+
+<!-- ##### FUNCTION camel_object_bag_remove ##### -->
+<para>
+
+</para>
+
+@bag: 
+@o: 
+
+
+<!-- ##### FUNCTION camel_object_bag_destroy ##### -->
+<para>
+
+</para>
+
+@bag: 
+
+
+<!-- ##### MACRO CAMEL_MAKE_CLASS ##### -->
+<para>
+
+</para>
+
+@type: 
+@tname: 
+@parent: 
+@pname: 
+
+
+<!-- ##### STRUCT CamelIteratorVTable ##### -->
+<para>
+
+</para>
+
+@free: 
+@next: 
+@reset: 
+@length: 
+
 <!-- ##### STRUCT CamelIterator ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index e5a1441..1f34b69 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -230,12 +230,6 @@ camel-search-sql-sexp.h
 camel-types
 
 
-<!-- ##### MACRO CAMEL_ARGV_MAX ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO CAMEL_GROUPWISE_FOLDER_LOCK ##### -->
 <para>
 
@@ -306,16 +300,6 @@ camel-types
 @f: 
 @l: 
 
-<!-- ##### MACRO CAMEL_MAKE_CLASS ##### -->
-<para>
-
-</para>
-
-@type: 
-@tname: 
-@parent: 
-@pname: 
-
 <!-- ##### MACRO CAMEL_NNTP_FOLDER_LOCK ##### -->
 <para>
 
@@ -348,14 +332,6 @@ camel-types
 @f: 
 @l: 
 
-<!-- ##### USER_FUNCTION CamelCopyFunc ##### -->
-<para>
-
-</para>
-
-@vo: 
-@Returns: 
-
 <!-- ##### STRUCT CamelImapFolderPrivate ##### -->
 <para>
 
@@ -369,16 +345,6 @@ camel-types
 </para>
 
 
-<!-- ##### STRUCT CamelIteratorVTable ##### -->
-<para>
-
-</para>
-
-@free: 
-@next: 
-@reset: 
-@length: 
-
 <!-- ##### STRUCT CamelLocalFolderPrivate ##### -->
 <para>
 
@@ -445,12 +411,6 @@ camel-types
 
 @dummy: 
 
-<!-- ##### STRUCT CamelObjectBag ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT CamelSimpleDataWrapper ##### -->
 <para>
 
@@ -505,36 +465,6 @@ camel-types
 @ai_canonname: 
 @ai_next: 
 
-<!-- ##### MACRO ca_double ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO ca_int ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO ca_object ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO ca_ptr ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO ca_str ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### FUNCTION camel_block_file_get_type ##### -->
 <para>
 
@@ -557,36 +487,6 @@ camel-types
 
 @Returns: 
 
-<!-- ##### FUNCTION camel_interface_cast ##### -->
-<para>
-
-</para>
-
-@klass: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_interface_is ##### -->
-<para>
-
-</para>
-
-@k: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_interface_register ##### -->
-<para>
-
-</para>
-
-@parent: 
-@name: 
-@classfuncs_size: 
-@class_init: 
-@class_finalize: 
-@Returns: 
-
 <!-- ##### FUNCTION camel_isubscribe_get_type ##### -->
 <para>
 
@@ -649,257 +549,6 @@ camel-types
 @buf: 
 @len: 
 
-<!-- ##### FUNCTION camel_name_to_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_bag_abort ##### -->
-<para>
-
-</para>
-
-@bag: 
-@key: 
-
-<!-- ##### FUNCTION camel_object_bag_add ##### -->
-<para>
-
-</para>
-
-@bag: 
-@key: 
-@vo: 
-
-<!-- ##### FUNCTION camel_object_bag_destroy ##### -->
-<para>
-
-</para>
-
-@bag: 
-
-<!-- ##### FUNCTION camel_object_bag_get ##### -->
-<para>
-
-</para>
-
-@bag: 
-@key: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_bag_list ##### -->
-<para>
-
-</para>
-
-@bag: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_bag_new ##### -->
-<para>
-
-</para>
-
-@hash: 
-@equal: 
-@keycopy: 
-@keyfree: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_bag_peek ##### -->
-<para>
-
-</para>
-
-@bag: 
-@key: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_bag_rekey ##### -->
-<para>
-
-</para>
-
-@bag: 
-@o: 
-@newkey: 
-
-<!-- ##### FUNCTION camel_object_bag_remove ##### -->
-<para>
-
-</para>
-
-@bag: 
-@o: 
-
-<!-- ##### FUNCTION camel_object_bag_reserve ##### -->
-<para>
-
-</para>
-
-@bag: 
-@key: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_cast ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_class_add_event ##### -->
-<para>
-
-</para>
-
-@klass: 
-@name: 
-@prep: 
-
-<!-- ##### FUNCTION camel_object_class_add_interface ##### -->
-<para>
-
-</para>
-
-@klass: 
-@itype: 
-
-<!-- ##### FUNCTION camel_object_class_cast ##### -->
-<para>
-
-</para>
-
-@klass: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_class_dump_tree ##### -->
-<para>
-
-</para>
-
-@root: 
-
-<!-- ##### FUNCTION camel_object_class_is ##### -->
-<para>
-
-</para>
-
-@klass: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_free ##### -->
-<para>
-
-</para>
-
-@vo: 
-@tag: 
-@value: 
-
-<!-- ##### FUNCTION camel_object_get ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ex: 
-@Varargs: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_get_int ##### -->
-<para>
-
-</para>
-
-@vo: 
-@ex: 
-@tag: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_get_interface ##### -->
-<para>
-
-</para>
-
-@vo: 
-@itype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_get_ptr ##### -->
-<para>
-
-</para>
-
-@vo: 
-@ex: 
-@tag: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_getv ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ex: 
-@Param3: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_hook_event ##### -->
-<para>
-
-</para>
-
-@obj: 
-@name: 
-@hook: 
-@data: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_is ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ctype: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_meta_get ##### -->
-<para>
-
-</para>
-
-@vo: 
-@name: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_meta_set ##### -->
-<para>
-
-</para>
-
-@vo: 
-@name: 
-@value: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_new ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
 <!-- ##### FUNCTION camel_object_new_name ##### -->
 <para>
 
@@ -908,83 +557,6 @@ camel-types
 @name: 
 @Returns: 
 
-<!-- ##### FUNCTION camel_object_ref ##### -->
-<para>
-
-</para>
-
-@Param1: 
-
-<!-- ##### FUNCTION camel_object_remove_event ##### -->
-<para>
-
-</para>
-
-@obj: 
-@id: 
-
-<!-- ##### FUNCTION camel_object_set ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ex: 
-@Varargs: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_setv ##### -->
-<para>
-
-</para>
-
-@obj: 
-@ex: 
-@Param3: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_state_read ##### -->
-<para>
-
-</para>
-
-@vo: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_state_write ##### -->
-<para>
-
-</para>
-
-@vo: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_object_trigger_event ##### -->
-<para>
-
-</para>
-
-@obj: 
-@name: 
-@event_data: 
-
-<!-- ##### FUNCTION camel_object_unhook_event ##### -->
-<para>
-
-</para>
-
-@obj: 
-@name: 
-@hook: 
-@data: 
-
-<!-- ##### FUNCTION camel_object_unref ##### -->
-<para>
-
-</para>
-
-@Param1: 
-
 <!-- ##### FUNCTION camel_partition_table_get_type ##### -->
 <para>
 
@@ -1122,42 +694,6 @@ camel-types
 
 @Returns: 
 
-<!-- ##### MACRO camel_type_get_global_classfuncs ##### -->
-<para>
-
-</para>
-
-@x: 
-
-<!-- ##### FUNCTION camel_type_init ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION camel_type_register ##### -->
-<para>
-
-</para>
-
-@parent: 
-@name: 
-@instance_size: 
-@classfuncs_size: 
-@class_init: 
-@class_finalize: 
-@instance_init: 
-@instance_finalize: 
-@Returns: 
-
-<!-- ##### FUNCTION camel_type_to_name ##### -->
-<para>
-
-</para>
-
-@type: 
-@Returns: 
-
 <!-- ##### FUNCTION camel_ustrstrcase ##### -->
 <para>
 
diff --git a/libedataserver/e-account.c b/libedataserver/e-account.c
index eb98728..47ec526 100644
--- a/libedataserver/e-account.c
+++ b/libedataserver/e-account.c
@@ -361,7 +361,7 @@ xml_set_identity (xmlNodePtr node, EAccountIdentity *id)
 			changed |= xml_set_prop (node, "uid", &id->sig_uid);
 			if (!id->sig_uid) {
 
-				/* WTF is this shit doing here?  Migrate is supposed to "handle this" */
+				/* XXX Migrate is supposed to "handle this" */
 
 				/* set a fake sig uid so the migrate code can handle this */
 				gboolean autogen = FALSE;
diff --git a/libedataserver/e-iconv.c b/libedataserver/e-iconv.c
index 94decb7..74c156a 100644
--- a/libedataserver/e-iconv.c
+++ b/libedataserver/e-iconv.c
@@ -190,7 +190,6 @@ static EDListNode *e_dlist_remove(EDListNode *n)
 }
 
 
-/* fucking glib... */
 static const char *
 e_strdown (char *str)
 {
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index af19e0e..97d7eba 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -214,27 +214,26 @@ e_sexp_resultv_free(struct _ESExp *f, int argc, struct _ESExpResult **argv)
 
 /* implementations for the builtin functions */
 
-/* can you tell, i dont like glib? */
 /* we can only itereate a hashtable from a called function */
-struct _glib_sux_donkeys {
+struct IterData {
 	int count;
 	GPtrArray *uids;
 };
 
 /* ok, store any values that are in all sets */
 static void
-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)
+htand(char *key, int value, struct IterData *iter_data)
 {
-	if (value == fuckup->count) {
-		g_ptr_array_add(fuckup->uids, key);
+	if (value == iter_data->count) {
+		g_ptr_array_add(iter_data->uids, key);
 	}
 }
 
 /* or, store all unique values */
 static void
-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)
+htor(char *key, int value, struct IterData *iter_data)
 {
-	g_ptr_array_add(fuckup->uids, key);
+	g_ptr_array_add(iter_data->uids, key);
 }
 
 static ESExpResult *
@@ -242,7 +241,7 @@ term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
 {
 	struct _ESExpResult *r, *r1;
 	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
+	struct IterData lambdafoo;
 	int type=-1;
 	int bool = TRUE;
 	int i;
@@ -286,7 +285,7 @@ term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
 	if (type == ESEXP_RES_ARRAY_PTR) {
 		lambdafoo.count = argc;
 		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &lambdafoo);
+		g_hash_table_foreach(ht, (GHFunc)htand, &lambdafoo);
 		r->type = ESEXP_RES_ARRAY_PTR;
 		r->value.ptrarray = lambdafoo.uids;
 	} else if (type == ESEXP_RES_BOOL) {
@@ -305,7 +304,7 @@ term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
 {
 	struct _ESExpResult *r, *r1;
 	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);
-	struct _glib_sux_donkeys lambdafoo;
+	struct IterData lambdafoo;
 	int type = -1;
 	int bool = FALSE;
 	int i;
@@ -345,7 +344,7 @@ term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)
 	if (type == ESEXP_RES_ARRAY_PTR) {
 		lambdafoo.count = argc;
 		lambdafoo.uids = g_ptr_array_new();
-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &lambdafoo);
+		g_hash_table_foreach(ht, (GHFunc)htor, &lambdafoo);
 		r->type = ESEXP_RES_ARRAY_PTR;
 		r->value.ptrarray = lambdafoo.uids;
 	} else if (type == ESEXP_RES_BOOL) {