# HG changeset patch # User Richard Laager # Date 1135199905 0 # Node ID e4e47871c37365e0c7cb11d0aa8ba3ed6893fcf9 # Parent 317d1dfedeed3cff90cf5cc1957f816f58c56811 [gaim-migrate @ 14938] SF Patch #1377898 from Nathan Conrad "This patch adds accelerator key mappings for buttons in dialog boxes created using gaim_request_action." committer: Tailor Script diff -r 317d1dfedeed -r e4e47871c373 src/gtkdialogs.c --- a/src/gtkdialogs.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/gtkdialogs.c Wed Dec 21 21:18:25 2005 +0000 @@ -865,7 +865,7 @@ buddy->name, contact->totalsize - 1); gaim_request_action(contact, NULL, _("Remove Contact"), text, 0, contact, 2, - _("Remove Contact"), G_CALLBACK(gaim_gtkdialogs_remove_contact_cb), + _("_Remove Contact"), G_CALLBACK(gaim_gtkdialogs_remove_contact_cb), _("Cancel"), NULL); g_free(text); @@ -927,7 +927,7 @@ group->name); gaim_request_action(group, NULL, _("Remove Group"), text, 0, group, 2, - _("Remove Group"), G_CALLBACK(gaim_gtkdialogs_remove_group_cb), + _("_Remove Group"), G_CALLBACK(gaim_gtkdialogs_remove_group_cb), _("Cancel"), NULL); g_free(text); @@ -969,7 +969,7 @@ buddy->name); gaim_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2, - _("Remove Buddy"), G_CALLBACK(gaim_gtkdialogs_remove_buddy_cb), + _("_Remove Buddy"), G_CALLBACK(gaim_gtkdialogs_remove_buddy_cb), _("Cancel"), NULL); g_free(text); @@ -1011,7 +1011,7 @@ name ? name : ""); gaim_request_action(chat, NULL, _("Remove Chat"), text, 0, chat, 2, - _("Remove Chat"), G_CALLBACK(gaim_gtkdialogs_remove_chat_cb), + _("_Remove Chat"), G_CALLBACK(gaim_gtkdialogs_remove_chat_cb), _("Cancel"), NULL); g_free(text); diff -r 317d1dfedeed -r e4e47871c373 src/gtkprivacy.c --- a/src/gtkprivacy.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/gtkprivacy.c Wed Dec 21 21:18:25 2005 +0000 @@ -591,7 +591,7 @@ _("Please enter the name of the user you wish to be " "able to contact you."), NULL, FALSE, FALSE, NULL, - _("Permit"), G_CALLBACK(add_permit_block_cb), + _("_Permit"), G_CALLBACK(add_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data), data); } @@ -604,7 +604,7 @@ gaim_request_action(account, _("Permit User"), primary, secondary, 0, data, 2, - _("Permit"), G_CALLBACK(confirm_permit_block_cb), + _("_Permit"), G_CALLBACK(confirm_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data)); g_free(primary); @@ -629,7 +629,7 @@ _("Type a user to block."), _("Please enter the name of the user you wish to block."), NULL, FALSE, FALSE, NULL, - _("Block"), G_CALLBACK(add_permit_block_cb), + _("_Block"), G_CALLBACK(add_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data), data); } @@ -640,7 +640,7 @@ gaim_request_action(account, _("Block User"), primary, secondary, 0, data, 2, - _("Block"), G_CALLBACK(confirm_permit_block_cb), + _("_Block"), G_CALLBACK(confirm_permit_block_cb), _("Cancel"), G_CALLBACK(destroy_request_data)); g_free(primary); diff -r 317d1dfedeed -r e4e47871c373 src/protocols/jabber/presence.c --- a/src/protocols/jabber/presence.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/protocols/jabber/presence.c Wed Dec 21 21:18:25 2005 +0000 @@ -316,8 +316,8 @@ gaim_request_action(js->gc, NULL, msg, NULL, GAIM_DEFAULT_ACTION_NONE, jap, 2, - _("Authorize"), G_CALLBACK(authorize_add_cb), - _("Deny"), G_CALLBACK(deny_add_cb)); + _("_Authorize"), G_CALLBACK(authorize_add_cb), + _("_Deny"), G_CALLBACK(deny_add_cb)); g_free(msg); jabber_id_free(jid); return; @@ -377,9 +377,9 @@ _("Create New Room"), _("You are creating a new room. Would you like to " "configure it, or accept the default settings?"), - 1, chat, 2, _("Configure Room"), + 1, chat, 2, _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), - _("Accept Defaults"), + _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); } } diff -r 317d1dfedeed -r e4e47871c373 src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/protocols/oscar/oscar.c Wed Dec 21 21:18:25 2005 +0000 @@ -1580,7 +1580,7 @@ "may be considered a privacy risk. Do you " "wish to continue?"), 0, data, 2, - _("Connect"), G_CALLBACK(oscar_direct_im), + _("_Connect"), G_CALLBACK(oscar_direct_im), _("Cancel"), G_CALLBACK(oscar_cancel_direct_im)); g_free(buf); } @@ -4345,8 +4345,8 @@ "Images. Because your IP address will be " "revealed, this may be considered a privacy " "risk."), -- GAIM_DEFAULT_ACTION_NONE, d, 2, - _("Connect"), G_CALLBACK(accept_direct_im_request), + GAIM_DEFAULT_ACTION_NONE, d, 2, + _("_Connect"), G_CALLBACK(accept_direct_im_request), _("Cancel"), G_CALLBACK(destroy_direct_im_request)); /* FIXME: we should actually send a packet on cancel */ } @@ -4425,7 +4425,7 @@ gaim_request_action(gc, NULL, _("Request Authorization"), dialog_msg, 0, data, 2, - _("Request Authorization"), + _("_Request Authorization"), G_CALLBACK(gaim_auth_request_msgprompt), _("Cancel"), G_CALLBACK(gaim_auth_dontrequest)); @@ -4587,9 +4587,9 @@ gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg, GAIM_DEFAULT_ACTION_NONE, data, - 2, _("Authorize"), + 2, _("_Authorize"), G_CALLBACK(gaim_auth_grant), - _("Deny"), + _("_Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt)); g_free(dialog_msg); } @@ -4660,7 +4660,7 @@ "to your buddy list?"), GAIM_DEFAULT_ACTION_NONE, data, 2, _("Add"), G_CALLBACK(gaim_icq_buddyadd), - _("Decline"), G_CALLBACK(oscar_free_name_data)); + _("_Decline"), G_CALLBACK(oscar_free_name_data)); g_free(message); } g_strfreev(text); @@ -7277,8 +7277,8 @@ gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg, GAIM_DEFAULT_ACTION_NONE, data, 2, - _("Authorize"), G_CALLBACK(gaim_auth_grant), - _("Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt)); + _("_Authorize"), G_CALLBACK(gaim_auth_grant), + _("_Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt)); g_free(dialog_msg); g_free(nombre); diff -r 317d1dfedeed -r e4e47871c373 src/protocols/silc/buddy.c --- a/src/protocols/silc/buddy.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/protocols/silc/buddy.c Wed Dec 21 21:18:25 2005 +0000 @@ -1041,7 +1041,7 @@ _("To add the buddy you must import his/her public key. " "Press Import to import a public key."), 0, r, 2, _("Cancel"), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb), - _("Import..."), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb)); + _("_Import..."), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb)); } static void diff -r 317d1dfedeed -r e4e47871c373 src/protocols/silc/ops.c --- a/src/protocols/silc/ops.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/protocols/silc/ops.c Wed Dec 21 21:18:25 2005 +0000 @@ -1295,7 +1295,7 @@ _("User Information"), buf, 1, client_entry, 2, _("OK"), G_CALLBACK(silcgaim_whois_more), - _("More..."), G_CALLBACK(silcgaim_whois_more)); + _("_More..."), G_CALLBACK(silcgaim_whois_more)); else #endif gaim_notify_userinfo(gc, client_entry->nickname, buf, NULL, NULL); diff -r 317d1dfedeed -r e4e47871c373 src/protocols/silc/pk.c --- a/src/protocols/silc/pk.c Wed Dec 21 20:59:16 2005 +0000 +++ b/src/protocols/silc/pk.c Wed Dec 21 21:18:25 2005 +0000 @@ -116,7 +116,7 @@ GAIM_DEFAULT_ACTION_NONE, verify, 3, _("Yes"), G_CALLBACK(silcgaim_verify_cb), _("No"), G_CALLBACK(silcgaim_verify_cb), - _("View..."), G_CALLBACK(silcgaim_verify_details)); + _("_View..."), G_CALLBACK(silcgaim_verify_details)); } void silcgaim_verify_public_key(SilcClient client, SilcClientConnection conn,