Mercurial > pidgin.yaz

comparison libpurple/protocols/oscar/peer.c @ 21560:665e04562de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This merge has the effect of reverting the hinting code from trunk.
author Richard Laager <rlaager@wiktel.com>
date Sat, 17 Nov 2007 00:12:30 +0000
parents 6de09629f091 fcb848b2d669
children 6dab6629497a
comparison
equal deleted inserted replaced
21544:9b4d1af17ced 21560:665e04562de0
1033 if (args->type == OSCAR_CAPABILITY_DIRECTIM) 1033 if (args->type == OSCAR_CAPABILITY_DIRECTIM)
1034 { 1034 {
1035 buf = g_strdup_printf(_("%s has just asked to directly connect to %s"), 1035 buf = g_strdup_printf(_("%s has just asked to directly connect to %s"),
1036 sn, purple_account_get_username(account)); 1036 sn, purple_account_get_username(account));
1037 1037
1038 purple_request_action_with_hint(conn, NULL, buf, 1038 purple_request_action(conn, NULL, buf,
1039 _("This requires a direct connection between " 1039 _("This requires a direct connection between "
1040 "the two computers and is necessary for IM " 1040 "the two computers and is necessary for IM "
1041 "Images. Because your IP address will be " 1041 "Images. Because your IP address will be "
1042 "revealed, this may be considered a privacy " 1042 "revealed, this may be considered a privacy "
1043 "risk."), 1043 "risk."),
1044 PURPLE_DEFAULT_ACTION_NONE, 1044 PURPLE_DEFAULT_ACTION_NONE,
1045 account, sn, NULL, 1045 account, sn, NULL,
1046 PURPLE_REQUEST_UI_HINT_BUDDY, conn, 2, 1046 conn, 2,
1047 _("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb), 1047 _("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb),
1048 _("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb)); 1048 _("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb));
1049 } 1049 }
1050 else if (args->type == OSCAR_CAPABILITY_SENDFILE) 1050 else if (args->type == OSCAR_CAPABILITY_SENDFILE)
1051 { 1051 {