Mercurial > pidgin

comparison libpurple/protocols/silc10/chat.c @ 20598:285bb637a2b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated hinting to be less invasive
author Gabriel Schulhof <nix@go-nix.ca>
date Sat, 22 Sep 2007 16:19:34 +0000
parents ab6d2763b8d8
children 8c9aad9479c0
comparison
equal deleted inserted replaced
20597:591267f6f1d5 20598:285bb637a2b7
286 SilcUInt32 m; 286 SilcUInt32 m;
287 287
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_with_hint(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), 293 G_CALLBACK(silcpurple_chat_chpk_cancel),
294 purple_connection_get_account(sg->gc), NULL, NULL, sgc); 294 purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc);
295 return; 295 return;
296 } 296 }
297 297
298 list = purple_request_field_list_get_items(f); 298 list = purple_request_field_list_get_items(f);
299 chpks = silc_buffer_alloc_size(2); 299 chpks = silc_buffer_alloc_size(2);
417 "then only users whose public keys are listed are able to join.")); 417 "then only users whose public keys are listed are able to join."));
418 418
419 if (!channel_pubkeys) { 419 if (!channel_pubkeys) {
420 f = purple_request_field_list_new("list", NULL); 420 f = purple_request_field_list_new("list", NULL);
421 purple_request_field_group_add_field(g, f); 421 purple_request_field_group_add_field(g, f);
422 purple_request_fields(sg->gc, _("Channel Authentication"), 422 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
423 _("Channel Authentication"), t, fields, 423 _("Channel Authentication"), t, fields,
424 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), 424 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
425 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), 425 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
426 purple_connection_get_account(sg->gc), NULL, NULL, sgc); 426 purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc);
427 return; 427 return;
428 } 428 }
429 sgc->pubkeys = silc_buffer_copy(channel_pubkeys); 429 sgc->pubkeys = silc_buffer_copy(channel_pubkeys);
430 430
431 g = purple_request_field_group_new(NULL); 431 g = purple_request_field_group_new(NULL);
456 silc_pkcs_free_identifier(ident); 456 silc_pkcs_free_identifier(ident);
457 pk = silc_argument_get_next_arg(chpks, &type, &pk_len); 457 pk = silc_argument_get_next_arg(chpks, &type, &pk_len);
458 } 458 }
459 459
460 purple_request_field_list_set_multi_select(f, FALSE); 460 purple_request_field_list_set_multi_select(f, FALSE);
461 purple_request_fields(sg->gc, _("Channel Authentication"), 461 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
462 _("Channel Authentication"), t, fields, 462 _("Channel Authentication"), t, fields,
463 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), 463 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
464 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), 464 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
465 purple_connection_get_account(sg->gc), NULL, NULL, sgc); 465 purple_connection_get_account(sg->gc), NULL, NULL, "cnoversation", sgc);
466 466
467 silc_argument_payload_free(chpks); 467 silc_argument_payload_free(chpks);
468 } 468 }
469 469
470 static void 470 static void
593 purple_request_fields_add_group(fields, g); 593 purple_request_fields_add_group(fields, g);
594 594
595 g_snprintf(tmp, sizeof(tmp), 595 g_snprintf(tmp, sizeof(tmp),
596 _("Please enter the %s channel private group name and passphrase."), 596 _("Please enter the %s channel private group name and passphrase."),
597 p->channel); 597 p->channel);
598 purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields, 598 purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields,
599 _("Add"), G_CALLBACK(silcpurple_chat_prv_add), 599 _("Add"), G_CALLBACK(silcpurple_chat_prv_add),
600 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), 600 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel),
601 purple_connection_get_account(gc), NULL, NULL, p); 601 purple_connection_get_account(gc), NULL, NULL, "conversation", p);
602 } 602 }
603 603
604 604
605 /****************************** Channel Modes ********************************/ 605 /****************************** Channel Modes ********************************/
606 606
721 if (!s) 721 if (!s)
722 return; 722 return;
723 s->channel = ch; 723 s->channel = ch;
724 s->sg = sg; 724 s->sg = sg;
725 g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit); 725 g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit);
726 purple_request_input(gc, _("User Limit"), NULL, 726 purple_request_input_with_hint(gc, _("User Limit"), NULL,
727 _("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."),
728 tmp, FALSE, FALSE, NULL, 728 tmp, FALSE, FALSE, NULL,
729 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), 729 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb),
730 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), 730 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb),
731 purple_connection_get_account(gc), NULL, NULL, s); 731 purple_connection_get_account(gc), NULL, NULL, "conversation", s);
732 } 732 }
733 733
734 static void 734 static void
735 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) 735 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data)
736 { 736 {