comparison src/gtkimhtml.c @ 10815:65c818fb218e

[gaim-migrate @ 12470] Fix the gtkimhtml bug that caused screennames to be duplicated in AIM profiles containing pasted conversations committer: Tailor Script <[e-mail]>

10814:364a2ef907ae

	VALID_OPT_TAG("BR");

	if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
		gchar *e = strstr (string + strlen("!--"), "-->");
		if (e) {
			/*
			 * If we uncomment the following line then HTML comments will be
			 * hidden.  This is good because it means when a WinAIM users pastes
			 * part of a conversation to you, the screen names won't be
			 * duplicated (because WinAIM pastes an HTML comment containing the
			 * screen name, for some reason).
			 *
			 * However, uncommenting this is bad because we use HTML comment
			 * tags to print timestamps to conversations (at least, I think...)
			 *
			 * KingAnt thinks it would be best to display timestamps using
			 * something other than comment tags.
			 */
			/* *type = -1; */
			*len = e - string + strlen ("-->");
			*tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->"));
			return TRUE;
		}
	}

					/* NEW_BIT (NEW_TEXT_BIT); */
					ws[wpos] = '\0';

					gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);

					if (imhtml->show_comments && !(options & GTK_IMHTML_NO_COMMENTS))
						wpos = g_snprintf (ws, len, "%s", tag);
					/* NEW_BIT (NEW_COMMENT_BIT); */
					break;
				default:
					break;
				}

10815:65c818fb218e

	VALID_OPT_TAG("BR");

	if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
		gchar *e = strstr (string + strlen("!--"), "-->");
		if (e) {
			*len = e - string + strlen ("-->");
			*tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->"));
			return TRUE;
		}
	}

					/* NEW_BIT (NEW_TEXT_BIT); */
					ws[wpos] = '\0';

					gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);

					if (imhtml->show_comments && !(options & GTK_IMHTML_NO_COMMENTS)) {
						wpos = g_snprintf (ws, len, "%s", tag);
						gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
					}
					ws[0] = '\0'; wpos = 0;

					/* NEW_BIT (NEW_COMMENT_BIT); */
					break;
				default:
					break;
				}