Mercurial > pidgin.yaz
comparison src/protocols/oscar/oscar.c @ 13732:79720436df40
[gaim-migrate @ 16143]
Fix another one of those assertion warnings. This also probably
makes font tags from iChat work correctly.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 07 May 2006 18:28:32 +0000 |
parents | ed73ef86f40c |
children | e4a4983752a9 |
comparison
equal
deleted
inserted
replaced
13731:e27f42866854 | 13732:79720436df40 |
---|---|
1857 struct buddyinfo *bi; | 1857 struct buddyinfo *bi; |
1858 char *iconfile; | 1858 char *iconfile; |
1859 GString *message; | 1859 GString *message; |
1860 gchar *tmp; | 1860 gchar *tmp; |
1861 aim_mpmsg_section_t *curpart; | 1861 aim_mpmsg_section_t *curpart; |
1862 const char *start; | 1862 const char *start, *end; |
1863 GData *attribs; | 1863 GData *attribs; |
1864 | 1864 |
1865 gaim_debug_misc("oscar", "Received IM from %s with %d parts\n", | 1865 gaim_debug_misc("oscar", "Received IM from %s with %d parts\n", |
1866 userinfo->sn, args->mpmsg.numparts); | 1866 userinfo->sn, args->mpmsg.numparts); |
1867 | 1867 |
1953 } | 1953 } |
1954 | 1954 |
1955 /* | 1955 /* |
1956 * Convert iChat color tags to normal font tags. | 1956 * Convert iChat color tags to normal font tags. |
1957 */ | 1957 */ |
1958 if (gaim_markup_find_tag("body", tmp, &start, NULL, &attribs)) | 1958 if (gaim_markup_find_tag("body", tmp, &start, &end, &attribs)) |
1959 { | 1959 { |
1960 const char *ichattextcolor, *ichatballooncolor; | 1960 const char *ichattextcolor, *ichatballooncolor; |
1961 | 1961 |
1962 ichattextcolor = g_datalist_get_data(&attribs, "ichattextcolor"); | 1962 ichattextcolor = g_datalist_get_data(&attribs, "ichattextcolor"); |
1963 if (ichattextcolor != NULL) | 1963 if (ichattextcolor != NULL) |