# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1234928872 0
# Node ID ba717632d0dae24625b6bf785db6465fb704b728
# Parent  62de664662b142adad55800d7d6986c9a6c0b1b5# Parent  a439f24713c829651638b3a11c88e6aeedf32b15
merge of '2f4f593dae7afcbb03bfccfe5db4d44697ec87ef'
     and 'fb7ee3052dd0938f8dd913a37b2a01557d72c329'

diff -r a439f24713c8 -r ba717632d0da Makefile.am
--- a/Makefile.am	Wed Feb 18 03:45:13 2009 +0000
+++ b/Makefile.am	Wed Feb 18 03:47:52 2009 +0000
@@ -99,7 +99,7 @@
 	@echo "Not generating devhelp index: xsltproc was not found by configure"
 endif
 else
-	@echo "doxygen was not found during configure.  Aborting."
+	@echo "doxygen was not found during configure.  Unable to build documentation."
 	@echo;
 endif
 
diff -r a439f24713c8 -r ba717632d0da libpurple/plugins/perl/common/Server.xs
--- a/libpurple/plugins/perl/common/Server.xs	Wed Feb 18 03:45:13 2009 +0000
+++ b/libpurple/plugins/perl/common/Server.xs	Wed Feb 18 03:47:52 2009 +0000
@@ -122,29 +122,28 @@
 	Purple::Connection gc
 	const char *name
 
-void 
-serv_join_chat(con, components)
-	Purple::Connection con 
-	SV * components
-INIT:
-	HV * t_HV;
-	HE * t_HE;
-	SV * t_SV;
-	GHashTable * t_GHash;
+void
+serv_join_chat(conn, components)
+	Purple::Connection conn
+	HV * components
+PREINIT:
+	HE *t_HE;
+	SV *t_SV;
 	I32 len;
+	GHashTable *t_GHash;
 	char *t_key, *t_value;
 CODE:
-	t_HV =  (HV *)SvRV(components);
 	t_GHash = g_hash_table_new(g_str_hash, g_str_equal);
 
-	for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) {
+	for (t_HE = hv_iternext(components); t_HE != NULL;
+	     t_HE = hv_iternext(components)) {
 		t_key = hv_iterkey(t_HE, &len);
-		t_SV = *hv_fetch(t_HV, t_key, len, 0);
- 		t_value = SvPVutf8_nolen(t_SV);
+		t_SV = *hv_fetch(components, t_key, len, 0);
+		t_value = SvPVutf8_nolen(t_SV);
 
 		g_hash_table_insert(t_GHash, t_key, t_value);
 	}
-	serv_join_chat(con, t_GHash);
+	serv_join_chat(conn, t_GHash);
 
 void 
 serv_move_buddy(buddy, group1, group2)
diff -r a439f24713c8 -r ba717632d0da libpurple/util.h
--- a/libpurple/util.h	Wed Feb 18 03:45:13 2009 +0000
+++ b/libpurple/util.h	Wed Feb 18 03:47:52 2009 +0000
@@ -1207,7 +1207,7 @@
 G_CONST_RETURN gchar *purple_gai_strerror(gint errnum);
 
 /**
- * Compares two UTF-8 strings case-insensitively.  This string is
+ * Compares two UTF-8 strings case-insensitively.  This comparison is
  * more expensive than a simple g_utf8_collate() comparison because
  * it calls g_utf8_casefold() on each string, which allocates new
  * strings.