changeset 21046:ecaa34fd0473

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.
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 29 Oct 2007 03:10:31 +0000
parents daf98e539358
children 9f0e2db39bc5 fe1b44022884
files libpurple/protocols/silc10/wb.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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));