comparison src/protocols/oscar/oscar.c @ 10816:c94f40ffcafb

[gaim-migrate @ 12471] rlaager reverted objectionable spacing changes committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 11 Apr 2005 15:26:51 +0000
parents d087e928ffd1
children d01d81de94d8
comparison
equal deleted inserted replaced
10815:65c818fb218e 10816:c94f40ffcafb
401 * just copy it. 401 * just copy it.
402 */ 402 */
403 if (utf8 == NULL) { 403 if (utf8 == NULL) {
404 if (textlen != 0 && *text != '\0' 404 if (textlen != 0 && *text != '\0'
405 && !g_utf8_validate(text, textlen, NULL)) 405 && !g_utf8_validate(text, textlen, NULL))
406 utf8 = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); 406 utf8 = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)"));
407 else 407 else
408 utf8 = g_strndup(text, textlen); 408 utf8 = g_strndup(text, textlen);
409 } 409 }
410 410
411 return utf8; 411 return utf8;
484 484
485 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE); 485 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
486 if (ret == NULL) 486 if (ret == NULL)
487 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE); 487 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
488 if (ret == NULL) 488 if (ret == NULL)
489 ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); 489 ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)"));
490 490
491 return ret; 491 return ret;
492 } 492 }
493 493
494 static void 494 static void
1571 buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."), 1571 buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."),
1572 buddy->name); 1572 buddy->name);
1573 1573
1574 gaim_request_action(gc, NULL, buf, 1574 gaim_request_action(gc, NULL, buf,
1575 _("Because this reveals your IP address, it " 1575 _("Because this reveals your IP address, it "
1576 "may be considered a privacy risk. Do you " 1576 "may be considered a privacy risk. Do you "
1577 "wish to continue?"), 1577 "wish to continue?"),
1578 0, data, 2, 1578 0, data, 2,
1579 _("Connect"), G_CALLBACK(oscar_direct_im), 1579 _("Connect"), G_CALLBACK(oscar_direct_im),
1580 _("Cancel"), G_CALLBACK(oscar_cancel_direct_im)); 1580 _("Cancel"), G_CALLBACK(oscar_cancel_direct_im));
1581 g_free(buf); 1581 g_free(buf);
1627 } 1627 }
1628 } else { 1628 } else {
1629 if ((conn->type == AIM_CONN_TYPE_BOS) || 1629 if ((conn->type == AIM_CONN_TYPE_BOS) ||
1630 !(aim_getconn_type(od->sess, AIM_CONN_TYPE_BOS))) 1630 !(aim_getconn_type(od->sess, AIM_CONN_TYPE_BOS)))
1631 { 1631 {
1632 gaim_debug_error("oscar", "Major connection error. " 1632 gaim_debug_error("oscar", "Major connection error. i.e. "
1633 "Invalid data was received on the oscar TCP stream\n"); 1633 "invalid data was received on the oscar TCP stream\n");
1634 gaim_connection_error(gc, _("Disconnected.")); 1634 gaim_connection_error(gc, _("Disconnected."));
1635 } else if (conn->type == AIM_CONN_TYPE_CHAT) { 1635 } else if (conn->type == AIM_CONN_TYPE_CHAT) {
1636 struct chat_connection *cc = find_oscar_chat_by_conn(gc, conn); 1636 struct chat_connection *cc = find_oscar_chat_by_conn(gc, conn);
1637 GaimConversation *conv = gaim_find_chat(gc, cc->id); 1637 GaimConversation *conv = gaim_find_chat(gc, cc->id);
1638 char *buf; 1638 char *buf;
1766 if (primitive == GAIM_STATUS_OFFLINE) 1766 if (primitive == GAIM_STATUS_OFFLINE)
1767 return; 1767 return;
1768 1768
1769 if (!aim_snvalid(gaim_account_get_username(account))) { 1769 if (!aim_snvalid(gaim_account_get_username(account))) {
1770 gchar *buf; 1770 gchar *buf;
1771 buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), gaim_account_get_username(account)); 1771 buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), gaim_account_get_username(account));
1772 gaim_connection_error(gc, buf); 1772 gaim_connection_error(gc, buf);
1773 g_free(buf); 1773 g_free(buf);
1774 } 1774 }
1775 1775
1776 if (aim_sn_is_icq((gaim_account_get_username(account)))) { 1776 if (aim_sn_is_icq((gaim_account_get_username(account)))) {
2431 break; 2431 break;
2432 in = '\0'; 2432 in = '\0';
2433 } 2433 }
2434 if (in != '\n') { 2434 if (in != '\n') {
2435 char buf[256]; 2435 char buf[256];
2436 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " 2436 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until "
2437 "this is fixed. Check %s for updates."), GAIM_WEBSITE); 2437 "this is fixed. Check %s for updates."), GAIM_WEBSITE);
2438 gaim_notify_warning(pos->gc, NULL, 2438 gaim_notify_warning(pos->gc, NULL,
2439 _("Gaim was unable to get a valid AIM login hash."), 2439 _("Gaim was unable to get a valid AIM login hash."),
2440 buf); 2440 buf);
2441 gaim_input_remove(pos->inpa); 2441 gaim_input_remove(pos->inpa);
2550 if (gaim_proxy_connect(pos->gc->account, "gaim.sourceforge.net", 80, straight_to_hell, pos) != 0) { 2550 if (gaim_proxy_connect(pos->gc->account, "gaim.sourceforge.net", 80, straight_to_hell, pos) != 0) {
2551 char buf[256]; 2551 char buf[256];
2552 if (pos->modname) 2552 if (pos->modname)
2553 g_free(pos->modname); 2553 g_free(pos->modname);
2554 g_free(pos); 2554 g_free(pos);
2555 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " 2555 g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until "
2556 "this is fixed. Check %s for updates."), GAIM_WEBSITE); 2556 "this is fixed. Check %s for updates."), GAIM_WEBSITE);
2557 gaim_notify_warning(pos->gc, NULL, 2557 gaim_notify_warning(pos->gc, NULL,
2558 _("Gaim was unable to get a valid login hash."), 2558 _("Gaim was unable to get a valid login hash."),
2559 buf); 2559 buf);
2560 } 2560 }
2561 2561
3493 gaim_debug_warning("oscar", 3493 gaim_debug_warning("oscar",
3494 "%s tried to send you a file with incomplete " 3494 "%s tried to send you a file with incomplete "
3495 "information.\n", userinfo->sn); 3495 "information.\n", userinfo->sn);
3496 if (args->proxyip) 3496 if (args->proxyip)
3497 gaim_debug_warning("oscar", 3497 gaim_debug_warning("oscar",
3498 "IP for a proxy server was given. Gaim " 3498 "IP for a proxy server was given. Gaim "
3499 "does not support this yet.\n"); 3499 "does not support this yet.\n");
3500 g_free(message); 3500 g_free(message);
3501 return 1; 3501 return 1;
3502 } 3502 }
3503 3503
3612 g_snprintf(buf, sizeof buf, _("%s has just asked to directly connect to %s"), userinfo->sn, username); 3612 g_snprintf(buf, sizeof buf, _("%s has just asked to directly connect to %s"), userinfo->sn, username);
3613 3613
3614 gaim_request_action(gc, NULL, buf, 3614 gaim_request_action(gc, NULL, buf,
3615 _("This requires a direct connection between " 3615 _("This requires a direct connection between "
3616 "the two computers and is necessary for IM " 3616 "the two computers and is necessary for IM "
3617 "Images. Because your IP address will be " 3617 "Images. Because your IP address will be "
3618 "revealed, this may be considered a privacy " 3618 "revealed, this may be considered a privacy "
3619 "risk."), 3619 "risk."),
3620 GAIM_DEFAULT_ACTION_NONE, d, 2, 3620 GAIM_DEFAULT_ACTION_NONE, d, 2,
3621 _("Connect"), G_CALLBACK(accept_direct_im_request), 3621 _("Connect"), G_CALLBACK(accept_direct_im_request),
3622 _("Cancel"), G_CALLBACK(destroy_direct_im_request)); 3622 _("Cancel"), G_CALLBACK(destroy_direct_im_request));
3688 if (buddy && (gaim_buddy_get_alias_only(buddy))) 3688 if (buddy && (gaim_buddy_get_alias_only(buddy)))
3689 nombre = g_strdup_printf("%s (%s)", name, gaim_buddy_get_alias_only(buddy)); 3689 nombre = g_strdup_printf("%s (%s)", name, gaim_buddy_get_alias_only(buddy));
3690 else 3690 else
3691 nombre = NULL; 3691 nombre = NULL;
3692 3692
3693 dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list. Do you want to send an authorization request?"), (nombre ? nombre : name)); 3693 dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list. Do you want to send an authorization request?"), (nombre ? nombre : name));
3694 data->gc = gc; 3694 data->gc = gc;
3695 data->name = g_strdup(name); 3695 data->name = g_strdup(name);
3696 data->nick = NULL; 3696 data->nick = NULL;
3697 3697
3698 gaim_request_action(gc, NULL, _("Request Authorization"), dialog_msg, 3698 gaim_request_action(gc, NULL, _("Request Authorization"), dialog_msg,
4100 } break; 4100 } break;
4101 4101
4102 default: { 4102 default: {
4103 gaim_debug_warning("oscar", 4103 gaim_debug_warning("oscar",
4104 "Received an unknown rendezvous client auto-response " 4104 "Received an unknown rendezvous client auto-response "
4105 "from %s. Type 0x%04hx\n", who, reason); 4105 "from %s. Type 0x%04hx\n", who, reason);
4106 } 4106 }
4107 4107
4108 } 4108 }
4109 4109
4110 return 0; 4110 return 0;
4132 g_free(dialogmsg); 4132 g_free(dialogmsg);
4133 } break; 4133 } break;
4134 4134
4135 default: { 4135 default: {
4136 gaim_debug_warning("oscar", 4136 gaim_debug_warning("oscar",
4137 "Received an unknown client auto-response from %s. " 4137 "Received an unknown client auto-response from %s. "
4138 "Type 0x%04hx\n", who, reason); 4138 "Type 0x%04hx\n", who, reason);
4139 } break; 4139 } break;
4140 } /* end of switch */ 4140 } /* end of switch */
4141 4141
4142 return 0; 4142 return 0;
4256 case 0x0002: { /* Typing */ 4256 case 0x0002: { /* Typing */
4257 serv_got_typing(gc, sn, 0, GAIM_TYPING); 4257 serv_got_typing(gc, sn, 0, GAIM_TYPING);
4258 } break; 4258 } break;
4259 4259
4260 default: { 4260 default: {
4261 gaim_debug_error("oscar", "Received unknown typing notification message from %s. Type1 is 0x%04x and type2 is 0x%04hx.\n", sn, type1, type2); 4261 gaim_debug_error("oscar", "Received unknown typing notification message from %s. Type1 is 0x%04x and type2 is 0x%04hx.\n", sn, type1, type2);
4262 } break; 4262 } break;
4263 } 4263 }
4264 4264
4265 return 1; 4265 return 1;
4266 } 4266 }
4867 va_start(ap, fr); 4867 va_start(ap, fr);
4868 code = (fu16_t)va_arg(ap, int); 4868 code = (fu16_t)va_arg(ap, int);
4869 msg = va_arg(ap, char *); 4869 msg = va_arg(ap, char *);
4870 va_end(ap); 4870 va_end(ap);
4871 4871
4872 gaim_debug_info("oscar", "Disconnected. Code is 0x%04x and msg is %s\n", 4872 gaim_debug_info("oscar", "Disconnected. Code is 0x%04x and msg is %s\n",
4873 code, (msg != NULL ? msg : "")); 4873 code, (msg != NULL ? msg : ""));
4874 4874
4875 g_return_val_if_fail(fr != NULL, 1); 4875 g_return_val_if_fail(fr != NULL, 1);
4876 g_return_val_if_fail(fr->conn != NULL, 1); 4876 g_return_val_if_fail(fr->conn != NULL, 1);
4877 4877
5101 va_start(ap, fr); 5101 va_start(ap, fr);
5102 msg = va_arg(ap, struct aim_icq_offlinemsg *); 5102 msg = va_arg(ap, struct aim_icq_offlinemsg *);
5103 va_end(ap); 5103 va_end(ap);
5104 5104
5105 gaim_debug_info("oscar", 5105 gaim_debug_info("oscar",
5106 "Received offline message. Converting to channel 4 ICBM...\n"); 5106 "Received offline message. Converting to channel 4 ICBM...\n");
5107 args.uin = msg->sender; 5107 args.uin = msg->sender;
5108 args.type = msg->type; 5108 args.type = msg->type;
5109 args.flags = msg->flags; 5109 args.flags = msg->flags;
5110 args.msglen = msg->msglen; 5110 args.msglen = msg->msglen;
5111 args.msg = msg->msg; 5111 args.msg = msg->msg;
5659 gsize msglen = 0; 5659 gsize msglen = 0;
5660 5660
5661 if (od->rights.maxsiglen == 0) 5661 if (od->rights.maxsiglen == 0)
5662 gaim_notify_warning(gc, NULL, _("Unable to set AIM profile."), 5662 gaim_notify_warning(gc, NULL, _("Unable to set AIM profile."),
5663 _("You have probably requested to set your " 5663 _("You have probably requested to set your "
5664 "profile before the login procedure completed. " 5664 "profile before the login procedure completed. "
5665 "Your profile remains unset; try setting it " 5665 "Your profile remains unset; try setting it "
5666 "again when you are fully connected.")); 5666 "again when you are fully connected."));
5667 5667
5668 if (!text) { 5668 if (!text) {
5669 aim_locate_setprofile(od->sess, NULL, "", 0, NULL, NULL, 0); 5669 aim_locate_setprofile(od->sess, NULL, "", 0, NULL, NULL, 0);
5686 } 5686 }
5687 5687
5688 if (msglen > od->rights.maxsiglen) { 5688 if (msglen > od->rights.maxsiglen) {
5689 gchar *errstr; 5689 gchar *errstr;
5690 errstr = g_strdup_printf(ngettext("The maximum profile length of %d byte " 5690 errstr = g_strdup_printf(ngettext("The maximum profile length of %d byte "
5691 "has been exceeded. Gaim has truncated it for you.", 5691 "has been exceeded. Gaim has truncated it for you.",
5692 "The maximum profile length of %d bytes " 5692 "The maximum profile length of %d bytes "
5693 "has been exceeded. Gaim has truncated it for you.", 5693 "has been exceeded. Gaim has truncated it for you.",
5694 od->rights.maxsiglen), od->rights.maxsiglen); 5694 od->rights.maxsiglen), od->rights.maxsiglen);
5695 gaim_notify_warning(gc, NULL, _("Profile too long."), errstr); 5695 gaim_notify_warning(gc, NULL, _("Profile too long."), errstr);
5696 g_free(errstr); 5696 g_free(errstr);
5697 } 5697 }
5698 5698
5723 5723
5724 if ((od == NULL) || (od->rights.maxawaymsglen == 0)) { 5724 if ((od == NULL) || (od->rights.maxawaymsglen == 0)) {
5725 gaim_notify_warning(gc, NULL, _("Unable to set AIM away message."), 5725 gaim_notify_warning(gc, NULL, _("Unable to set AIM away message."),
5726 _("You have probably requested to set your " 5726 _("You have probably requested to set your "
5727 "away message before the login procedure " 5727 "away message before the login procedure "
5728 "completed. You remain in a \"present\" " 5728 "completed. You remain in a \"present\" "
5729 "state; try setting it again when you are " 5729 "state; try setting it again when you are "
5730 "fully connected.")); 5730 "fully connected."));
5731 return; 5731 return;
5732 } 5732 }
5733 5733
5769 5769
5770 if (msglen > od->rights.maxawaymsglen) { 5770 if (msglen > od->rights.maxawaymsglen) {
5771 gchar *errstr; 5771 gchar *errstr;
5772 5772
5773 errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte " 5773 errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte "
5774 "has been exceeded. Gaim has truncated it for you.", 5774 "has been exceeded. Gaim has truncated it for you.",
5775 "The maximum away message length of %d bytes " 5775 "The maximum away message length of %d bytes "
5776 "has been exceeded. Gaim has truncated it for you.", 5776 "has been exceeded. Gaim has truncated it for you.",
5777 od->rights.maxawaymsglen), od->rights.maxawaymsglen); 5777 od->rights.maxawaymsglen), od->rights.maxawaymsglen);
5778 gaim_notify_warning(gc, NULL, _("Away message too long."), errstr); 5778 gaim_notify_warning(gc, NULL, _("Away message too long."), errstr);
5779 g_free(errstr); 5779 g_free(errstr);
5780 } 5780 }
5781 5781
5871 oscar_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) { 5871 oscar_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) {
5872 OscarData *od = (OscarData *)gc->proto_data; 5872 OscarData *od = (OscarData *)gc->proto_data;
5873 5873
5874 if (!aim_snvalid(buddy->name)) { 5874 if (!aim_snvalid(buddy->name)) {
5875 gchar *buf; 5875 gchar *buf;
5876 buf = g_strdup_printf(_("Could not add the buddy %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), buddy->name); 5876 buf = g_strdup_printf(_("Could not add the buddy %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), buddy->name);
5877 if (!gaim_conv_present_error(buddy->name, gaim_connection_get_account(gc), buf)) 5877 if (!gaim_conv_present_error(buddy->name, gaim_connection_get_account(gc), buf))
5878 gaim_notify_error(gc, NULL, _("Unable To Add"), buf); 5878 gaim_notify_error(gc, NULL, _("Unable To Add"), buf);
5879 g_free(buf); 5879 g_free(buf);
5880 5880
5881 /* Remove from local list */ 5881 /* Remove from local list */
6036 6036
6037 gaim_debug_error("oscar", "ssi: SNAC error %hu\n", reason); 6037 gaim_debug_error("oscar", "ssi: SNAC error %hu\n", reason);
6038 6038
6039 if (reason == 0x0005) { 6039 if (reason == 0x0005) {
6040 gaim_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"), 6040 gaim_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"),
6041 _("Gaim was temporarily unable to retrieve your buddy list from the AIM servers. Your buddy list is not lost, and will probably become available in a few hours.")); 6041 _("Gaim was temporarily unable to retrieve your buddy list from the AIM servers. Your buddy list is not lost, and will probably become available in a few hours."));
6042 od->getblisttimer = gaim_timeout_add(300000, gaim_ssi_rerequestdata, od->sess); 6042 od->getblisttimer = gaim_timeout_add(300000, gaim_ssi_rerequestdata, od->sess);
6043 } 6043 }
6044 6044
6045 /* Activate SSI */ 6045 /* Activate SSI */
6046 /* Sending the enable causes other people to be able to see you, and you to see them */ 6046 /* Sending the enable causes other people to be able to see you, and you to see them */
6107 6107
6108 gaim_debug_info("oscar", 6108 gaim_debug_info("oscar",
6109 "ssi: syncing local list and server list\n"); 6109 "ssi: syncing local list and server list\n");
6110 6110
6111 if ((timestamp == 0) || (numitems == 0)) { 6111 if ((timestamp == 0) || (numitems == 0)) {
6112 gaim_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.", NULL); 6112 gaim_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.", NULL);
6113 return 1; 6113 return 1;
6114 } 6114 }
6115 6115
6116 /* Clean the buddy list */ 6116 /* Clean the buddy list */
6117 aim_ssi_cleanlist(sess); 6117 aim_ssi_cleanlist(sess);
6327 case 0x0000: { /* added successfully */ 6327 case 0x0000: { /* added successfully */
6328 } break; 6328 } break;
6329 6329
6330 case 0x000c: { /* you are over the limit, the cheat is to the limit, come on fhqwhgads */ 6330 case 0x000c: { /* you are over the limit, the cheat is to the limit, come on fhqwhgads */
6331 gchar *buf; 6331 gchar *buf;
6332 buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)"))); 6332 buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)")));
6333 if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf)) 6333 if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf))
6334 gaim_notify_error(gc, NULL, _("Unable To Add"), buf); 6334 gaim_notify_error(gc, NULL, _("Unable To Add"), buf);
6335 g_free(buf); 6335 g_free(buf);
6336 } 6336 }
6337 6337
6341 } break; 6341 } break;
6342 6342
6343 default: { /* La la la */ 6343 default: { /* La la la */
6344 gchar *buf; 6344 gchar *buf;
6345 gaim_debug_error("oscar", "ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack); 6345 gaim_debug_error("oscar", "ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack);
6346 buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."), (retval->name ? retval->name : _("(no name)"))); 6346 buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."), (retval->name ? retval->name : _("(no name)")));
6347 if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf)) 6347 if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf))
6348 gaim_notify_error(gc, NULL, _("Unable To Add"), buf); 6348 gaim_notify_error(gc, NULL, _("Unable To Add"), buf);
6349 g_free(buf); 6349 g_free(buf);
6350 } break; 6350 } break;
6351 } 6351 }
6424 if (buddy && (gaim_buddy_get_alias_only(buddy))) 6424 if (buddy && (gaim_buddy_get_alias_only(buddy)))
6425 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy)); 6425 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy));
6426 else 6426 else
6427 nombre = g_strdup(sn); 6427 nombre = g_strdup(sn);
6428 6428
6429 dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list. Do you want to add them?"), nombre); 6429 dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list. Do you want to add them?"), nombre);
6430 data = g_new(struct name_data, 1); 6430 data = g_new(struct name_data, 1);
6431 data->gc = gc; 6431 data->gc = gc;
6432 data->name = g_strdup(sn); 6432 data->name = g_strdup(sn);
6433 data->nick = NULL; 6433 data->nick = NULL;
6434 6434
6495 reply = (fu8_t)va_arg(ap, int); 6495 reply = (fu8_t)va_arg(ap, int);
6496 msg = va_arg(ap, char *); 6496 msg = va_arg(ap, char *);
6497 va_end(ap); 6497 va_end(ap);
6498 6498
6499 gaim_debug_info("oscar", 6499 gaim_debug_info("oscar",
6500 "ssi: received authorization reply from %s. Reply is 0x%04hhx\n", sn, reply); 6500 "ssi: received authorization reply from %s. Reply is 0x%04hhx\n", sn, reply);
6501 6501
6502 buddy = gaim_find_buddy(gc->account, sn); 6502 buddy = gaim_find_buddy(gc->account, sn);
6503 if (buddy && (gaim_buddy_get_alias_only(buddy))) 6503 if (buddy && (gaim_buddy_get_alias_only(buddy)))
6504 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy)); 6504 nombre = g_strdup_printf("%s (%s)", sn, gaim_buddy_get_alias_only(buddy));
6505 else 6505 else