# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1248032315 0
# Node ID c90de665e04201da3f3f3a724ee63b3ba7ac4271
# Parent  5d75276a575f020a6dc3e1c47cc41e01eb68b3be# Parent  3edd01d04004b1b0b8eac96e31f97eddd1cee4fd
merge of '51da76f83bc049dc92e4199b15f634d001a5fa02'
     and '80e8cabf693147bcebc8857d383b6aab279d75ae'

diff -r 5d75276a575f -r c90de665e042 libpurple/util.c
--- a/libpurple/util.c	Sun Jul 19 19:07:54 2009 +0000
+++ b/libpurple/util.c	Sun Jul 19 19:38:35 2009 +0000
@@ -1409,8 +1409,7 @@
 	gboolean ignore;
 };
 
-#define ALLOW_TAG_ALT(x, y) do { \
-					if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
+#define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
 						const char *o = c + strlen("<" x); \
 						const char *p = NULL, *q = NULL, *r = NULL; \
 						GString *innards = g_string_new(""); \
@@ -1481,7 +1480,6 @@
 						c = strchr(c, '>') + 1; \
 						continue; \
 					} \
-				} while (0);
 #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x)
 void
 purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
@@ -1574,8 +1572,9 @@
 				ALLOW_TAG("h5");
 				ALLOW_TAG("h6");
 				/* we only allow html to start the message */
-				if(c == html)
+				if(c == html) {
 					ALLOW_TAG("html");
+				}
 				ALLOW_TAG_ALT("i", "em");
 				ALLOW_TAG_ALT("italic", "em");
 				ALLOW_TAG("li");