comparison src/protocols/zephyr/zephyr.c @ 7070:b794695d7c72

[gaim-migrate @ 7635] Arun A Tharuvai (aat) writes: " The function zephyr_to_html() occasionally interprets some actual text as non-functional formatting code to be ignored. All text between an @ sign (used to start tags), and the first opener (one of '<', '{', '[', or '(' ) for example, From: <[e-mail]>, <[e-mail]> was getting munged to From: <[e-mail]> The attached patch checks for the existence of a closer between an @ and an opener, outputting the section verbatim." committer: Tailor Script <[e-mail]>

7069:184ec972f0f5

		if (message[cnt] == '@') {
			zframe *new_f;
			char *buf;
			int end;
			for (end=1; (cnt+end) <= len &&
					!IS_OPENER(message[cnt+end]); end++);
			buf = g_new0(char, end);
			if (end) {
				g_snprintf(buf, end, "%s", message+cnt+1);
			}
			if (!g_ascii_strcasecmp(buf, "italic") ||

				cnt += end+1; /* cnt points to char after opener */
			} else {
				if ((cnt+end) > len) {
					g_string_append_c(frames->text, '@');
					cnt++;
				} else {
					/* unrecognized thingie. act like it's not there, but we
					 * still need to take care of the corresponding closer,
					 * make a frame that does nothing. */
					new_f = g_new(zframe, 1);
					new_f->enclosing = frames;

7070:b794695d7c72

		if (message[cnt] == '@') {
			zframe *new_f;
			char *buf;
			int end;
			for (end=1; (cnt+end) <= len &&
					!IS_OPENER(message[cnt+end]) && !IS_CLOSER(message[cnt+end]); end++);
			buf = g_new0(char, end);
			if (end) {
				g_snprintf(buf, end, "%s", message+cnt+1);
			}
			if (!g_ascii_strcasecmp(buf, "italic") ||

				cnt += end+1; /* cnt points to char after opener */
			} else {
				if ((cnt+end) > len) {
					g_string_append_c(frames->text, '@');
					cnt++;
				} else if (IS_CLOSER(message[cnt+end])) {
                                        /* We have @chars..closer . This is 
                                           merely a sequence of chars that isn't a formatting tag
                                        */
                                        int tmp=cnt;
                                        while (tmp<=cnt+end) {
                                                g_string_append_c(frames->text,message[tmp]);
                                                tmp++;
                                        }
                                        cnt+=end+1;
                                } else {
					/* unrecognized thingie. act like it's not there, but we
					 * still need to take care of the corresponding closer,
					 * make a frame that does nothing. */
					new_f = g_new(zframe, 1);
					new_f->enclosing = frames;