comparison: libpurple/protocols/oscar/odc.c
libpurple/protocols/oscar/odc.c
- branch
- release-2.x.y
- changeset 40755
- fb2056ce3c58
- parent 35208
- fe36722f772e
equal
deleted
inserted
replaced
| 40719:833a9f17abd3 | 40755:fb2056ce3c58 |
|---|---|
| 24 #include "peer.h" | 24 #include "peer.h" |
| 25 | 25 |
| 26 /* From Purple */ | 26 /* From Purple */ |
| 27 #include "conversation.h" | 27 #include "conversation.h" |
| 28 #include "imgstore.h" | 28 #include "imgstore.h" |
| 29 #include "glibcompat.h" | |
| 29 #include "util.h" | 30 #include "util.h" |
| 30 | 31 |
| 31 #define DIRECTIM_MAX_FILESIZE 52428800 | 32 #define DIRECTIM_MAX_FILESIZE 52428800 |
| 32 | 33 |
| 33 /** | 34 /** |
| 352 embedded_data = g_hash_table_lookup(embedded_datas, | 353 embedded_data = g_hash_table_lookup(embedded_datas, |
| 353 GINT_TO_POINTER(id)); | 354 GINT_TO_POINTER(id)); |
| 354 | 355 |
| 355 if ((embedded_data != NULL) && (embedded_data->size == size)) | 356 if ((embedded_data != NULL) && (embedded_data->size == size)) |
| 356 { | 357 { |
| 357 imgid = purple_imgstore_add_with_id(g_memdup(embedded_data->data, size), size, src); | 358 imgid = purple_imgstore_add_with_id(g_memdup2(embedded_data->data, size), size, src); |
| 358 | 359 |
| 359 /* Record the image number */ | 360 /* Record the image number */ |
| 360 images = g_slist_append(images, GINT_TO_POINTER(imgid)); | 361 images = g_slist_append(images, GINT_TO_POINTER(imgid)); |
| 361 } | 362 } |
| 362 } | 363 } |
