# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1179288238 0
# Node ID 7cdc1d7fad5586a507c39c3edd8c5e9e726134a7
# Parent  80350acaa289475b362e97acfdcd0e2cc88684a6# Parent  de2946d55a2db1fd73c02beb66f265ef6701edef
merge of '2d13b954e5450868a468d8b0a8c49f22f3b6d09f'
     and '48de9c844b6b246cc9f0be9ce455ed6d33d4c9da'

diff -r 80350acaa289 -r 7cdc1d7fad55 libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Wed May 16 03:46:26 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Wed May 16 04:03:58 2007 +0000
@@ -156,7 +156,7 @@
 static gboolean check_expire_time(struct joinpart_key *key,
                                   time_t *last_said, time_t *limit)
 {
-	purple_debug_info("joinpart", "Removing key for %s/%s\n", key->conv->name, key->user);
+	purple_debug_info("joinpart", "Removing key for %s\n", key->user);
 	return (*last_said < *limit);
 }