Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/switchboard.c @ 31160:7a26ff6c0044

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 73717266fa7d3a35ac09e09781fc5b48e2954fab) to branch 'im.pidgin.cpw.qulogic.msnp16' (head 0e28179a771a31a9afec296749d9f6c1e7f7587c)
author Mark Doliner <mark@kingant.net>
date Thu, 22 Apr 2010 17:15:26 +0000
parents c316749944c1 67024624f59b
children 930b267d33c0 66e7fe9f7810
comparison
equal deleted inserted replaced
31159:77b2d015bbf5 31160:7a26ff6c0044
941 purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n"); 941 purple_debug_error("msn", "Unable to decode Ink from Base64 format.\n");
942 return; 942 return;
943 } 943 }
944 944
945 imgid = purple_imgstore_add_with_id(image_data, image_len, NULL); 945 imgid = purple_imgstore_add_with_id(image_data, image_len, NULL);
946 image_msg = g_strdup_printf("<IMG ID='%d'/>", imgid); 946 image_msg = g_strdup_printf("<IMG ID='%d'>", imgid);
947 947
948 if (swboard->current_users > 1 || 948 if (swboard->current_users > 1 ||
949 ((swboard->conv != NULL) && 949 ((swboard->conv != NULL) &&
950 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) 950 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
951 serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg, 951 serv_got_chat_in(gc, swboard->chat_id, passport, 0, image_msg,