Mercurial > pidgin
comparison libpurple/protocols/silc/ops.c @ 16475:5e47b3427b28
propagate from branch 'im.pidgin.rlaager.gaim_migration' (head dcc40d46afbe3f87cc674e4fb1526ac722bc35cb)
to branch 'im.pidgin.pidgin' (head 0ef5b6c44115778e329fd628324124f872f5253b)
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 27 Apr 2007 02:14:44 +0000 |
| parents | a5176db228b7 24bbd7e46bfe |
| children | 980a104267da |
comparison
equal
deleted
inserted
replaced
| 16464:b2044e10915a | 16475:5e47b3427b28 |
|---|---|
| 159 convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, | 159 convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, |
| 160 channel->channel_name, sg->account); | 160 channel->channel_name, sg->account); |
| 161 if (channel && !convo) | 161 if (channel && !convo) |
| 162 goto out; | 162 goto out; |
| 163 | 163 |
| 164 imgid = purple_imgstore_add(data, data_len, ""); | 164 imgid = purple_imgstore_add_with_id(g_memdup(data, data_len), data_len, ""); |
| 165 if (imgid) { | 165 if (imgid) { |
| 166 cflags |= PURPLE_MESSAGE_IMAGES | PURPLE_MESSAGE_RECV; | 166 cflags |= PURPLE_MESSAGE_IMAGES | PURPLE_MESSAGE_RECV; |
| 167 g_snprintf(tmp, sizeof(tmp), "<IMG ID=\"%d\">", imgid); | 167 g_snprintf(tmp, sizeof(tmp), "<IMG ID=\"%d\">", imgid); |
| 168 | 168 |
| 169 if (channel) | 169 if (channel) |
| 175 else | 175 else |
| 176 serv_got_im(gc, sender->nickname ? | 176 serv_got_im(gc, sender->nickname ? |
| 177 sender->nickname : "<unknown>", | 177 sender->nickname : "<unknown>", |
| 178 tmp, cflags, time(NULL)); | 178 tmp, cflags, time(NULL)); |
| 179 | 179 |
| 180 purple_imgstore_unref(imgid); | 180 purple_imgstore_unref_by_id(imgid); |
| 181 cflags = 0; | 181 cflags = 0; |
| 182 } | 182 } |
| 183 goto out; | 183 goto out; |
| 184 } | 184 } |
| 185 | 185 |