comparison: src/protocols/oscar/oscar.c
src/protocols/oscar/oscar.c
- changeset 9972
- f39adb92a177
- parent 9971
- 8291bafb0025
- child 9973
- e163f8e7e8a4
equal
deleted
inserted
replaced
| 9971:8291bafb0025 | 9972:f39adb92a177 |
|---|---|
| 3471 gaim_request_action(gc, NULL, buf, | 3471 gaim_request_action(gc, NULL, buf, |
| 3472 _("This requires a direct connection between " | 3472 _("This requires a direct connection between " |
| 3473 "the two computers and is necessary for IM " | 3473 "the two computers and is necessary for IM " |
| 3474 "Images. Because your IP address will be " | 3474 "Images. Because your IP address will be " |
| 3475 "revealed, this may be considered a privacy " | 3475 "revealed, this may be considered a privacy " |
| 3476 "risk."), 0, d, 2, | 3476 "risk."), |
| 3477 GAIM_DEFAULT_ACTION_NONE, d, 2, | |
| 3477 _("Connect"), G_CALLBACK(accept_direct_im_request), | 3478 _("Connect"), G_CALLBACK(accept_direct_im_request), |
| 3478 _("Cancel"), G_CALLBACK(destroy_direct_im_request)); | 3479 _("Cancel"), G_CALLBACK(destroy_direct_im_request)); |
| 3479 /* FIXME: we should actually send a packet on cancel */ | 3480 /* FIXME: we should actually send a packet on cancel */ |
| 3480 } | 3481 } |
| 3481 } else if (args->reqclass & AIM_CAPS_ICQSERVERRELAY) { | 3482 } else if (args->reqclass & AIM_CAPS_ICQSERVERRELAY) { |
| 3786 data->nick = g_strdup(text[i*2+2]); | 3787 data->nick = g_strdup(text[i*2+2]); |
| 3787 | 3788 |
| 3788 gaim_request_action(gc, NULL, message, | 3789 gaim_request_action(gc, NULL, message, |
| 3789 _("Do you want to add this buddy " | 3790 _("Do you want to add this buddy " |
| 3790 "to your buddy list?"), | 3791 "to your buddy list?"), |
| 3791 0, data, 2, | 3792 GAIM_DEFAULT_ACTION_NONE, data, 2, |
| 3792 _("Add"), G_CALLBACK(gaim_icq_buddyadd), | 3793 _("Add"), G_CALLBACK(gaim_icq_buddyadd), |
| 3793 _("Decline"), G_CALLBACK(oscar_free_name_data)); | 3794 _("Decline"), G_CALLBACK(oscar_free_name_data)); |
| 3794 g_free(message); | 3795 g_free(message); |
| 3795 } | 3796 } |
| 3796 g_strfreev(text); | 3797 g_strfreev(text); |
| 6270 data->gc = gc; | 6271 data->gc = gc; |
| 6271 data->name = g_strdup(sn); | 6272 data->name = g_strdup(sn); |
| 6272 data->nick = NULL; | 6273 data->nick = NULL; |
| 6273 | 6274 |
| 6274 gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg, | 6275 gaim_request_action(gc, NULL, _("Authorization Request"), dialog_msg, |
| 6275 0, data, 2, | 6276 GAIM_DEFAULT_ACTION_NONE, data, 2, |
| 6276 _("Authorize"), G_CALLBACK(gaim_auth_grant), | 6277 _("Authorize"), G_CALLBACK(gaim_auth_grant), |
| 6277 _("Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt)); | 6278 _("Deny"), G_CALLBACK(gaim_auth_dontgrant_msgprompt)); |
| 6278 | 6279 |
| 6279 g_free(dialog_msg); | 6280 g_free(dialog_msg); |
| 6280 g_free(nombre); | 6281 g_free(nombre); |
| 6509 if (b != NULL && isdigit(b->name[0])) | 6510 if (b != NULL && isdigit(b->name[0])) |
| 6510 return "icq"; | 6511 return "icq"; |
| 6511 return "aim"; | 6512 return "aim"; |
| 6512 } | 6513 } |
| 6513 | 6514 |
| 6514 static void oscar_list_emblems(GaimBuddy *b, char **se, char **sw, char **nw, char **ne) | 6515 static void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) |
| 6515 { | 6516 { |
| 6516 GaimAccount *account = NULL; | 6517 GaimAccount *account = NULL; |
| 6517 GaimConnection *gc = NULL; | 6518 GaimConnection *gc = NULL; |
| 6518 OscarData *od = NULL; | 6519 OscarData *od = NULL; |
| 6519 char *emblems[4] = {NULL,NULL,NULL,NULL}; | 6520 char *emblems[4] = {NULL,NULL,NULL,NULL}; |
