# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177478757 0
# Node ID 58a09785938869e65aa245c8daa4f9bfb2672a8e
# Parent  f4c72a72274147ed8088c9ca31e34a331137d85d# Parent  c85fa74f7e50aa515558a410d2e6596bd040c7be
merge of '5a1b790556f2372c9cfc080af4a11e3c3d19b2ce'
     and '7b2e3a93824b2aa9d1939d622c2d12f0bd02ee5d'

diff -r f4c72a722741 -r 58a097859388 COPYRIGHT
--- a/COPYRIGHT	Wed Apr 25 02:36:05 2007 +0000
+++ b/COPYRIGHT	Wed Apr 25 05:25:57 2007 +0000
@@ -74,6 +74,7 @@
 Todd Cohen
 Jono Cole
 Lorenzo Colitti
+Jeff Connelly
 Nathan Conrad
 Felipe Contreras
 Alex Converse
diff -r f4c72a722741 -r 58a097859388 libpurple/plugins/mono/api/Makefile.am
diff -r f4c72a722741 -r 58a097859388 libpurple/plugins/mono/loader/Makefile.am
diff -r f4c72a722741 -r 58a097859388 libpurple/prpl.h
--- a/libpurple/prpl.h	Wed Apr 25 02:36:05 2007 +0000
+++ b/libpurple/prpl.h	Wed Apr 25 05:25:57 2007 +0000
@@ -175,8 +175,11 @@
 
 	/**
 	 * Returns the base icon name for the given buddy and account.
-	 * If buddy is NULL, it will return the name to use for the account's
-	 * icon.  This must be implemented.
+	 * If buddy is NULL and the account is non-NULL, it will return the 
+	 * name to use for the account's icon. If both are NULL, it will
+	 * return the name to use for the protocol's icon.
+	 *
+	 * This must be implemented.
 	 */
 	const char *(*list_icon)(PurpleAccount *account, PurpleBuddy *buddy);