Mercurial > pidgin
comparison libpurple/protocols/msn/switchboard.c @ 30036:31f20c9c7674
merge of '21280175da42b51e30e31b091bb3b4adf7708407'
and 'de0f6b7b9429dd7161de925ce6bdb02fbb7daaec'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 23 Apr 2010 22:19:23 +0000 |
| parents | 911ca152210c 67024624f59b |
| children | a37aa0ddfc0f 66e7fe9f7810 |
comparison
equal
deleted
inserted
replaced
| 30035:e47a4a7940ea | 30036:31f20c9c7674 |
|---|---|
| 944 purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n"); | 944 purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n"); |
| 945 return; | 945 return; |
| 946 } | 946 } |
| 947 | 947 |
| 948 imgid = purple_imgstore_add_with_id(image_data, image_len, NULL); | 948 imgid = purple_imgstore_add_with_id(image_data, image_len, NULL); |
| 949 image_msg = g_strdup_printf("<IMG ID='%d'/>", imgid); | 949 image_msg = g_strdup_printf("<IMG ID='%d'>", imgid); |
| 950 | 950 |
| 951 if (swboard->current_users > 1 || | 951 if (swboard->current_users > 1 || |
| 952 ((swboard->conv != NULL) && | 952 ((swboard->conv != NULL) && |
| 953 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) | 953 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
| 954 serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg, | 954 serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg, |