Mercurial > pidgin
comparison libpurple/protocols/silc/chat.c @ 16442:a5176db228b7
Update SILC to match resent request API changes
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Thu, 26 Apr 2007 13:10:57 +0000 |
parents | 32c366eeeb99 |
children | 980a104267da |
comparison
equal
deleted
inserted
replaced
16441:eb36a10796d7 | 16442:a5176db228b7 |
---|---|
288 f = purple_request_fields_get_field(fields, "list"); | 288 f = purple_request_fields_get_field(fields, "list"); |
289 if (!purple_request_field_list_get_selected(f)) { | 289 if (!purple_request_field_list_get_selected(f)) { |
290 /* Add new public key */ | 290 /* Add new public key */ |
291 purple_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE, | 291 purple_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE, |
292 G_CALLBACK(silcpurple_chat_chpk_add), | 292 G_CALLBACK(silcpurple_chat_chpk_add), |
293 G_CALLBACK(silcpurple_chat_chpk_cancel), sgc); | 293 G_CALLBACK(silcpurple_chat_chpk_cancel), |
294 purple_connection_get_account(sg->gc), NULL, NULL, sgc); | |
294 return; | 295 return; |
295 } | 296 } |
296 | 297 |
297 list = purple_request_field_list_get_items(f); | 298 list = purple_request_field_list_get_items(f); |
298 chpks = silc_buffer_alloc_size(2); | 299 chpks = silc_buffer_alloc_size(2); |
419 f = purple_request_field_list_new("list", NULL); | 420 f = purple_request_field_list_new("list", NULL); |
420 purple_request_field_group_add_field(g, f); | 421 purple_request_field_group_add_field(g, f); |
421 purple_request_fields(sg->gc, _("Channel Authentication"), | 422 purple_request_fields(sg->gc, _("Channel Authentication"), |
422 _("Channel Authentication"), t, fields, | 423 _("Channel Authentication"), t, fields, |
423 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), | 424 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), |
424 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), sgc); | 425 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), |
426 purple_connection_get_account(sg->gc), NULL, NULL, sgc); | |
425 return; | 427 return; |
426 } | 428 } |
427 sgc->pubkeys = silc_buffer_copy(channel_pubkeys); | 429 sgc->pubkeys = silc_buffer_copy(channel_pubkeys); |
428 | 430 |
429 g = purple_request_field_group_new(NULL); | 431 g = purple_request_field_group_new(NULL); |
457 | 459 |
458 purple_request_field_list_set_multi_select(f, FALSE); | 460 purple_request_field_list_set_multi_select(f, FALSE); |
459 purple_request_fields(sg->gc, _("Channel Authentication"), | 461 purple_request_fields(sg->gc, _("Channel Authentication"), |
460 _("Channel Authentication"), t, fields, | 462 _("Channel Authentication"), t, fields, |
461 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), | 463 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), |
462 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), sgc); | 464 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), |
465 purple_connection_get_account(sg->gc), NULL, NULL, sgc); | |
463 | 466 |
464 silc_argument_payload_free(chpks); | 467 silc_argument_payload_free(chpks); |
465 } | 468 } |
466 | 469 |
467 static void | 470 static void |
592 g_snprintf(tmp, sizeof(tmp), | 595 g_snprintf(tmp, sizeof(tmp), |
593 _("Please enter the %s channel private group name and passphrase."), | 596 _("Please enter the %s channel private group name and passphrase."), |
594 p->channel); | 597 p->channel); |
595 purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields, | 598 purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields, |
596 _("Add"), G_CALLBACK(silcpurple_chat_prv_add), | 599 _("Add"), G_CALLBACK(silcpurple_chat_prv_add), |
597 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), p); | 600 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), |
601 purple_connection_get_account(gc), NULL, NULL, p); | |
598 } | 602 } |
599 | 603 |
600 | 604 |
601 /****************************** Channel Modes ********************************/ | 605 /****************************** Channel Modes ********************************/ |
602 | 606 |
721 g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit); | 725 g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit); |
722 purple_request_input(gc, _("User Limit"), NULL, | 726 purple_request_input(gc, _("User Limit"), NULL, |
723 _("Set user limit on channel. Set to zero to reset user limit."), | 727 _("Set user limit on channel. Set to zero to reset user limit."), |
724 tmp, FALSE, FALSE, NULL, | 728 tmp, FALSE, FALSE, NULL, |
725 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), | 729 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), |
726 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), s); | 730 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), |
731 purple_connection_get_account(gc), NULL, NULL, s); | |
727 } | 732 } |
728 | 733 |
729 static void | 734 static void |
730 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) | 735 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) |
731 { | 736 { |