comparison: libpurple/protocols/oscar/odc.c
libpurple/protocols/oscar/odc.c
- changeset 36089
- c035b9a63457
- parent 35829
- 268931512478
- child 39463
- d47e230b9d75
equal
deleted
inserted
replaced
| 36088:4c386387f6f3 | 36089:c035b9a63457 |
|---|---|
| 62 PurpleAccount *account; | 62 PurpleAccount *account; |
| 63 PurpleIMConversation *im; | 63 PurpleIMConversation *im; |
| 64 | 64 |
| 65 account = purple_connection_get_account(conn->od->gc); | 65 account = purple_connection_get_account(conn->od->gc); |
| 66 im = purple_im_conversation_new(account, conn->bn); | 66 im = purple_im_conversation_new(account, conn->bn); |
| 67 purple_conversation_write(PURPLE_CONVERSATION(im), NULL, tmp, | 67 purple_conversation_write_system_message( |
| 68 PURPLE_MESSAGE_SYSTEM, time(NULL)); | 68 PURPLE_CONVERSATION(im), tmp, 0); |
| 69 g_free(tmp); | 69 g_free(tmp); |
| 70 } | 70 } |
| 71 | 71 |
| 72 if (conn->frame != NULL) | 72 if (conn->frame != NULL) |
| 73 { | 73 { |
| 556 } | 556 } |
| 557 | 557 |
| 558 /* Tell the local user that we are connected */ | 558 /* Tell the local user that we are connected */ |
| 559 account = purple_connection_get_account(gc); | 559 account = purple_connection_get_account(gc); |
| 560 im = purple_im_conversation_new(account, conn->bn); | 560 im = purple_im_conversation_new(account, conn->bn); |
| 561 purple_conversation_write(PURPLE_CONVERSATION(im), NULL, _("Direct IM established"), | 561 purple_conversation_write_system_message( |
| 562 PURPLE_MESSAGE_SYSTEM, time(NULL)); | 562 PURPLE_CONVERSATION(im), _("Direct IM established"), 0); |
| 563 } | 563 } |
| 564 | 564 |
| 565 if ((frame->type != 0x0001) && (frame->subtype != 0x0006)) | 565 if ((frame->type != 0x0001) && (frame->subtype != 0x0006)) |
| 566 { | 566 { |
| 567 purple_debug_info("oscar", "Unknown ODC frame type 0x%04hx, " | 567 purple_debug_info("oscar", "Unknown ODC frame type 0x%04hx, " |
| 601 g_free(size1); | 601 g_free(size1); |
| 602 g_free(size2); | 602 g_free(size2); |
| 603 | 603 |
| 604 account = purple_connection_get_account(conn->od->gc); | 604 account = purple_connection_get_account(conn->od->gc); |
| 605 im = purple_im_conversation_new(account, conn->bn); | 605 im = purple_im_conversation_new(account, conn->bn); |
| 606 purple_conversation_write(PURPLE_CONVERSATION(im), NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); | 606 purple_conversation_write_system_message( |
| 607 PURPLE_CONVERSATION(im), tmp, 0); | |
| 607 g_free(tmp); | 608 g_free(tmp); |
| 608 | 609 |
| 609 peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL); | 610 peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL); |
| 610 g_free(frame); | 611 g_free(frame); |
| 611 return; | 612 return; |
