comparison libpurple/protocols/myspace/myspace.c @ 17961:e5525819d652

Finish emoticon support. You can now send smileys to yourself, they can be disabled, and compilation produces no smiley-related warnings.
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sat, 21 Jul 2007 02:51:43 +0000
parents f61047bae7c0
children 8e351e08aba0
comparison
equal deleted inserted replaced
17960:f61047bae7c0 17961:e5525819d652
1118 new = NULL; 1118 new = NULL;
1119 1119
1120 for (i = 0; emoticon_symbols[i] != NULL; ++i) 1120 for (i = 0; emoticon_symbols[i] != NULL; ++i)
1121 { 1121 {
1122 1122
1123 replacement = g_strdup_printf("<i n=\"%s\">", emoticon_names[i]); 1123 replacement = g_strdup_printf("<i n=\"%s\"/>", emoticon_names[i]);
1124 1124
1125 purple_debug_info("msim", "msim_convert_smileys_to_markup: %s->%s\n", 1125 purple_debug_info("msim", "msim_convert_smileys_to_markup: %s->%s\n",
1126 emoticon_symbols[i], replacement); 1126 emoticon_symbols[i], replacement);
1127 new = str_replace(old, emoticon_symbols[i], replacement); 1127 new = str_replace(old, emoticon_symbols[i], replacement);
1128 1128
1155 gchar *markup; 1155 gchar *markup;
1156 1156
1157 markup = msim_convert_xml(session, raw, 1157 markup = msim_convert_xml(session, raw,
1158 (MSIM_XMLNODE_CONVERT)(html_tag_to_msim_markup)); 1158 (MSIM_XMLNODE_CONVERT)(html_tag_to_msim_markup));
1159 1159
1160 if (purple_account_get_bool(session->account, "smileys", TRUE)) 1160 if (purple_account_get_bool(session->account, "emoticons", TRUE))
1161 { 1161 {
1162 /* Frees markup and allocates a new one. */ 1162 /* Frees markup and allocates a new one. */
1163 markup = msim_convert_smileys_to_markup(markup); 1163 markup = msim_convert_smileys_to_markup(markup);
1164 } 1164 }
1165 1165