# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1177289571 0
# Node ID 915a56e08a9d5f008670750bf963d7340e17ad1b
# Parent  ac9d28bba272309eb085216dd743f57b48ca217d# Parent  3c01acbf3478b393bf6339efb9c7c3cbaf55422b
merge of 'b40bd1885046f301b11610cd406822e5d32968f7'
     and 'c160ad5b1979376c855bd74321ba7bfac438181f'

diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/plugins/joinpart.c
diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/plugins/log_reader.c
diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/plugins/pluginpref_example.c
diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/plugins/psychic.c
diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/plugins/statenotify.c
diff -r 3c01acbf3478 -r 915a56e08a9d libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Fri Apr 27 02:34:42 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Apr 23 00:52:51 2007 +0000
@@ -76,7 +76,8 @@
 	purple_privacy_permit_remove(gc->account,who,TRUE);
 }
 
-gboolean yahoo_privacy_check(PurpleConnection *gc, const char *who)
+gboolean
+yahoo_privacy_check(PurpleConnection *gc, const char *who)
 {
 	/* returns TRUE if allowed through, FALSE otherwise */
 	gboolean permitted;