comparison: libpurple/protocols/silc/chat.c
libpurple/protocols/silc/chat.c
- changeset 21225
- 32d8e16cb7a9
- parent 21220
- 3bb27fe7d046
- child 21226
- a60b30c9eeb5
- child 21233
- e75de8db4f2b
- child 21345
- 0ae8ed7bbf35
equal
deleted
inserted
replaced
| 21223:6517e0eda8bc | 21225:32d8e16cb7a9 |
|---|---|
| 302 if (!purple_request_field_list_get_selected(f)) { | 302 if (!purple_request_field_list_get_selected(f)) { |
| 303 /* Add new public key */ | 303 /* Add new public key */ |
| 304 purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE, | 304 purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE, |
| 305 G_CALLBACK(silcpurple_chat_chpk_add), | 305 G_CALLBACK(silcpurple_chat_chpk_add), |
| 306 G_CALLBACK(silcpurple_chat_chpk_cancel), | 306 G_CALLBACK(silcpurple_chat_chpk_cancel), |
| 307 purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); | 307 purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); |
| 308 return; | 308 return; |
| 309 } | 309 } |
| 310 | 310 |
| 311 list = purple_request_field_list_get_items(f); | 311 list = purple_request_field_list_get_items(f); |
| 312 chpks = silc_buffer_alloc_size(2); | 312 chpks = silc_buffer_alloc_size(2); |
| 443 purple_request_field_group_add_field(g, f); | 443 purple_request_field_group_add_field(g, f); |
| 444 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), | 444 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), |
| 445 _("Channel Authentication"), t, fields, | 445 _("Channel Authentication"), t, fields, |
| 446 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), | 446 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), |
| 447 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), | 447 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), |
| 448 purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); | 448 purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); |
| 449 if (channel_pubkeys) | 449 if (channel_pubkeys) |
| 450 silc_dlist_uninit(channel_pubkeys); | 450 silc_dlist_uninit(channel_pubkeys); |
| 451 return; | 451 return; |
| 452 } | 452 } |
| 453 sgc->pubkeys = channel_pubkeys; | 453 sgc->pubkeys = channel_pubkeys; |
| 478 purple_request_field_list_set_multi_select(f, FALSE); | 478 purple_request_field_list_set_multi_select(f, FALSE); |
| 479 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), | 479 purple_request_fields_with_hint(sg->gc, _("Channel Authentication"), |
| 480 _("Channel Authentication"), t, fields, | 480 _("Channel Authentication"), t, fields, |
| 481 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), | 481 _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), |
| 482 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), | 482 _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), |
| 483 purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); | 483 purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); |
| 484 } | 484 } |
| 485 | 485 |
| 486 static void | 486 static void |
| 487 silcpurple_chat_chauth(PurpleBlistNode *node, gpointer data) | 487 silcpurple_chat_chauth(PurpleBlistNode *node, gpointer data) |
| 488 { | 488 { |
| 612 _("Please enter the %s channel private group name and passphrase."), | 612 _("Please enter the %s channel private group name and passphrase."), |
| 613 p->channel); | 613 p->channel); |
| 614 purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields, | 614 purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields, |
| 615 _("Add"), G_CALLBACK(silcpurple_chat_prv_add), | 615 _("Add"), G_CALLBACK(silcpurple_chat_prv_add), |
| 616 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), | 616 _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), |
| 617 purple_connection_get_account(gc), NULL, NULL, "conversation", p); | 617 purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, p); |
| 618 } | 618 } |
| 619 | 619 |
| 620 | 620 |
| 621 /****************************** Channel Modes ********************************/ | 621 /****************************** Channel Modes ********************************/ |
| 622 | 622 |
| 742 purple_request_input_with_hint(gc, _("User Limit"), NULL, | 742 purple_request_input_with_hint(gc, _("User Limit"), NULL, |
| 743 _("Set user limit on channel. Set to zero to reset user limit."), | 743 _("Set user limit on channel. Set to zero to reset user limit."), |
| 744 tmp, FALSE, FALSE, NULL, | 744 tmp, FALSE, FALSE, NULL, |
| 745 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), | 745 _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), |
| 746 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), | 746 _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), |
| 747 purple_connection_get_account(gc), NULL, NULL, "conversation", s); | 747 purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, s); |
| 748 } | 748 } |
| 749 | 749 |
| 750 static void | 750 static void |
| 751 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) | 751 silcpurple_chat_resettopic(PurpleBlistNode *node, gpointer data) |
| 752 { | 752 { |
