Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 30788:053776c347c8
propagate from branch 'im.pidgin.pidgin' (head 6259f2ab71027fb5030213c7adb95cb367f35642)
to branch 'im.pidgin.soc.2010.icq-tlc' (head 6f5f6937f71fdbcf6ffbf3f9f32ed191571c513f)
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Thu, 20 May 2010 13:51:24 +0000 |
| parents | f18b6eb0ed02 |
| children | 89de882d25b1 a47346a46cb7 674a656893a3 |
comparison
equal
deleted
inserted
replaced
| 30408:8995c173d010 | 30788:053776c347c8 |
|---|---|
| 4649 if (oscar_util_valid_name_sms(name)) { | 4649 if (oscar_util_valid_name_sms(name)) { |
| 4650 /* Messaging an SMS (mobile) user--strip HTML */ | 4650 /* Messaging an SMS (mobile) user--strip HTML */ |
| 4651 tmp2 = purple_markup_strip_html(tmp1); | 4651 tmp2 = purple_markup_strip_html(tmp1); |
| 4652 is_html = FALSE; | 4652 is_html = FALSE; |
| 4653 } else { | 4653 } else { |
| 4654 tmp2 = g_strdup(tmp1); | 4654 /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ |
| 4655 tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1); | |
| 4655 is_html = TRUE; | 4656 is_html = TRUE; |
| 4656 } | 4657 } |
| 4657 g_free(tmp1); | 4658 g_free(tmp1); |
| 4658 tmp1 = tmp2; | 4659 tmp1 = tmp2; |
| 4659 | 4660 |