# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1193627431 0
# Node ID ecaa34fd04731a0fa284ac0f4eea4e22eae98e4e
# Parent  daf98e539358272ce745ad1f99eadaa6dcda5b84
Port this fix from silc 1.1 prpl to silc 1.0 prpl:
 * Closes unnecessary whiteboard request dialogs if user hasn't accepted
   previous requests.
References #3103.

diff -r daf98e539358 -r ecaa34fd0473 libpurple/protocols/silc10/wb.c
--- a/libpurple/protocols/silc10/wb.c	Mon Oct 29 02:46:25 2007 +0000
+++ b/libpurple/protocols/silc10/wb.c	Mon Oct 29 03:10:31 2007 +0000
@@ -279,6 +279,9 @@
 		return;
 	}
 
+	/* Close any previous unaccepted requests */
+	purple_request_close_with_handle(sender);
+
 	if (!channel) {
 		g_snprintf(tmp, sizeof(tmp),
 			_("%s sent message to whiteboard. Would you like "
@@ -299,7 +302,7 @@
 	req->channel = channel;
 	req->sg = sg;
 
-	purple_request_action(gc, _("Whiteboard"), tmp, NULL, 1,
+	purple_request_action(sender, _("Whiteboard"), tmp, NULL, 1,
 				sg->account, sender->nickname, NULL, req, 2,
 			    _("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_wb_request_cb));