diff src/protocols/silc/chat.c @ 11201:07dc8c6a359f

[gaim-migrate @ 13329] This hopefully fixes a lot of potential crashes in the SILC PRPL. Possible things to do: -Backport these changes to oldstatus -Ask the SILC guy to make sure all of these make sense. It's likely there are better things that could be used as handles -Check for other places in Gaim that don't give handles when they should committer: Tailor Script <[e-mail]>

--- a/src/protocols/silc/chat.c	Mon Aug 08 01:40:41 2005 +0000
+++ b/src/protocols/silc/chat.c	Mon Aug 08 02:18:16 2005 +0000
@@ -286,7 +286,7 @@
 	f = gaim_request_fields_get_field(fields, "list");
 	if (!gaim_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		gaim_request_file(NULL, _("Open Public Key..."), NULL, FALSE,
+		gaim_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				  G_CALLBACK(silcgaim_chat_chpk_add),
 				  G_CALLBACK(silcgaim_chat_chpk_cancel), sgc);
 		return;
@@ -416,7 +416,7 @@
 	if (!channel_pubkeys) {
 		f = gaim_request_field_list_new("list", NULL);
 		gaim_request_field_group_add_field(g, f);
-		gaim_request_fields(NULL, _("Channel Authentication"),
+		gaim_request_fields(sg->gc, _("Channel Authentication"),
 				    _("Channel Authentication"), t, fields,
 				    _("Add / Remove"), G_CALLBACK(silcgaim_chat_chpk_cb),
 				    _("OK"), G_CALLBACK(silcgaim_chat_chauth_ok), sgc);
@@ -454,7 +454,7 @@
 	}
 
 	gaim_request_field_list_set_multi_select(f, FALSE);
-	gaim_request_fields(NULL, _("Channel Authentication"),
+	gaim_request_fields(sg->gc, _("Channel Authentication"),
 			    _("Channel Authentication"), t, fields,
 			    _("Add / Remove"), G_CALLBACK(silcgaim_chat_chpk_cb),
 			    _("OK"), G_CALLBACK(silcgaim_chat_chauth_ok), sgc);
@@ -590,7 +590,7 @@
 	g_snprintf(tmp, sizeof(tmp),
 		   _("Please enter the %s channel private group name and passphrase."),
 		   p->channel);
-	gaim_request_fields(NULL, _("Add Channel Private Group"), NULL, tmp, fields,
+	gaim_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields,
 			    _("Add"), G_CALLBACK(silcgaim_chat_prv_add),
 			    _("Cancel"), G_CALLBACK(silcgaim_chat_prv_cancel), p);
 }
@@ -717,7 +717,7 @@
 	s->channel = ch;
 	s->sg = sg;
 	g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit);
-	gaim_request_input(NULL, _("User Limit"), NULL,
+	gaim_request_input(gc, _("User Limit"), NULL,
 			   _("Set user limit on channel. Set to zero to reset user limit."),
 			   tmp, FALSE, FALSE, NULL,
 			   _("OK"), G_CALLBACK(silcgaim_chat_ulimit_cb),