im.pidgin.pidgin: c630ec53bad2efe91357c6f37e705fbb1562d4ae

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c630ec53bad2efe91357c6f37e705fbb1562d4ae
Ancestor: 1ea3cb529d3609b61f6a983fcd4773906cf52539
Author: nosnilmot at pidgin.im
Date: 2007-10-29T03:10:31
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/silc10/wb.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/silc10/wb.c	693fdcd5c07844ae5c9b2e8673975f773d4319c8
+++ libpurple/protocols/silc10/wb.c	fbd2efacdc539f317f4daff44fa2c1dce2ea667f
@@ -279,6 +279,9 @@ silcpurple_wb_request(SilcClient client,
 		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 @@ silcpurple_wb_request(SilcClient client,
 	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));