comparison: libgaim/protocols/oscar/peer.c
libgaim/protocols/oscar/peer.c
- changeset 14410
- a5ae93474db6
- parent 14329
- 05c3cc0c1f79
- child 14464
- b7bca43f75b3
equal
deleted
inserted
replaced
| 14409:cc26a16fb10a | 14410:a5ae93474db6 |
|---|---|
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 PeerConnection * | 71 PeerConnection * |
| 72 peer_connection_find_by_type(OscarData *od, const char *sn, OscarCapability type) | 72 peer_connection_find_by_type(OscarData *od, const char *sn, OscarCapability type) |
| 73 { | 73 { |
| 74 GList *cur; | 74 GSList *cur; |
| 75 PeerConnection *conn; | 75 PeerConnection *conn; |
| 76 | 76 |
| 77 for (cur = od->peer_connections; cur != NULL; cur = cur->next) | 77 for (cur = od->peer_connections; cur != NULL; cur = cur->next) |
| 78 { | 78 { |
| 79 conn = cur->data; | 79 conn = cur->data; |
| 88 * @param cookie This must be exactly 8 characters. | 88 * @param cookie This must be exactly 8 characters. |
| 89 */ | 89 */ |
| 90 PeerConnection * | 90 PeerConnection * |
| 91 peer_connection_find_by_cookie(OscarData *od, const char *sn, const guchar *cookie) | 91 peer_connection_find_by_cookie(OscarData *od, const char *sn, const guchar *cookie) |
| 92 { | 92 { |
| 93 GList *cur; | 93 GSList *cur; |
| 94 PeerConnection *conn; | 94 PeerConnection *conn; |
| 95 | 95 |
| 96 for (cur = od->peer_connections; cur != NULL; cur = cur->next) | 96 for (cur = od->peer_connections; cur != NULL; cur = cur->next) |
| 97 { | 97 { |
| 98 conn = cur->data; | 98 conn = cur->data; |
| 124 if (type == OSCAR_CAPABILITY_DIRECTIM) | 124 if (type == OSCAR_CAPABILITY_DIRECTIM) |
| 125 memcpy(conn->magic, "ODC2", 4); | 125 memcpy(conn->magic, "ODC2", 4); |
| 126 else if (type == OSCAR_CAPABILITY_SENDFILE) | 126 else if (type == OSCAR_CAPABILITY_SENDFILE) |
| 127 memcpy(conn->magic, "OFT2", 4); | 127 memcpy(conn->magic, "OFT2", 4); |
| 128 | 128 |
| 129 od->peer_connections = g_list_prepend(od->peer_connections, conn); | 129 od->peer_connections = g_slist_prepend(od->peer_connections, conn); |
| 130 | 130 |
| 131 return conn; | 131 return conn; |
| 132 } | 132 } |
| 133 | 133 |
| 134 static void | 134 static void |
| 222 g_free(conn->proxyip); | 222 g_free(conn->proxyip); |
| 223 g_free(conn->clientip); | 223 g_free(conn->clientip); |
| 224 g_free(conn->verifiedip); | 224 g_free(conn->verifiedip); |
| 225 gaim_circ_buffer_destroy(conn->buffer_outgoing); | 225 gaim_circ_buffer_destroy(conn->buffer_outgoing); |
| 226 | 226 |
| 227 conn->od->peer_connections = g_list_remove(conn->od->peer_connections, conn); | 227 conn->od->peer_connections = g_slist_remove(conn->od->peer_connections, conn); |
| 228 | 228 |
| 229 g_free(conn); | 229 g_free(conn); |
| 230 | 230 |
| 231 return FALSE; | 231 return FALSE; |
| 232 } | 232 } |
