Mercurial > pidgin
comparison libpurple/protocols/msn/slpmsg.c @ 28693:6aea98f6a5cd
Get rid of slpmsg->fp since the core is handling all the partial reads and
writes, and this is no longer used.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 20 Nov 2009 01:17:51 +0000 |
parents | 35b6fd563056 |
children | 287fc4ac2bd9 |
comparison
equal
deleted
inserted
replaced
28692:19e400679e61 | 28693:6aea98f6a5cd |
---|---|
58 if (purple_debug_is_verbose()) | 58 if (purple_debug_is_verbose()) |
59 purple_debug_info("msn", "slpmsg destroy (%p)\n", slpmsg); | 59 purple_debug_info("msn", "slpmsg destroy (%p)\n", slpmsg); |
60 | 60 |
61 slplink = slpmsg->slplink; | 61 slplink = slpmsg->slplink; |
62 | 62 |
63 if (slpmsg->fp != NULL) | |
64 fclose(slpmsg->fp); | |
65 | |
66 purple_imgstore_unref(slpmsg->img); | 63 purple_imgstore_unref(slpmsg->img); |
67 | 64 |
68 /* We don't want to free the data of the PurpleStoredImage, | 65 /* We don't want to free the data of the PurpleStoredImage, |
69 * but to avoid code duplication, it's sharing buffer. */ | 66 * but to avoid code duplication, it's sharing buffer. */ |
70 if (slpmsg->img == NULL) | 67 if (slpmsg->img == NULL) |
94 long long size) | 91 long long size) |
95 { | 92 { |
96 /* We can only have one data source at a time. */ | 93 /* We can only have one data source at a time. */ |
97 g_return_if_fail(slpmsg->buffer == NULL); | 94 g_return_if_fail(slpmsg->buffer == NULL); |
98 g_return_if_fail(slpmsg->img == NULL); | 95 g_return_if_fail(slpmsg->img == NULL); |
99 g_return_if_fail(slpmsg->fp == NULL); | 96 g_return_if_fail(slpmsg->ft == FALSE); |
100 | 97 |
101 if (body != NULL) | 98 if (body != NULL) |
102 slpmsg->buffer = g_memdup(body, size); | 99 slpmsg->buffer = g_memdup(body, size); |
103 else | 100 else |
104 slpmsg->buffer = g_new0(guchar, size); | 101 slpmsg->buffer = g_new0(guchar, size); |
110 msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img) | 107 msn_slpmsg_set_image(MsnSlpMessage *slpmsg, PurpleStoredImage *img) |
111 { | 108 { |
112 /* We can only have one data source at a time. */ | 109 /* We can only have one data source at a time. */ |
113 g_return_if_fail(slpmsg->buffer == NULL); | 110 g_return_if_fail(slpmsg->buffer == NULL); |
114 g_return_if_fail(slpmsg->img == NULL); | 111 g_return_if_fail(slpmsg->img == NULL); |
115 g_return_if_fail(slpmsg->fp == NULL); | 112 g_return_if_fail(slpmsg->ft == FALSE); |
116 | 113 |
117 slpmsg->img = purple_imgstore_ref(img); | 114 slpmsg->img = purple_imgstore_ref(img); |
118 slpmsg->buffer = (guchar *)purple_imgstore_get_data(img); | 115 slpmsg->buffer = (guchar *)purple_imgstore_get_data(img); |
119 slpmsg->size = purple_imgstore_get_size(img); | 116 slpmsg->size = purple_imgstore_get_size(img); |
120 } | 117 } |