First step in this merge. Mostly a bzr merge and then a cleanup of conflicts

and parts I want to/have to redo (because of ui-fix).

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/misc.c b/lib/misc.c
index b696b8c4..c37996fc 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -156,6 +156,7 @@ void strip_html( char *in )
 	char out[strlen(in)+1];
 	char *s = out, *cs;
 	int i, matched;
+	int taglen;
 	
 	memset( out, 0, sizeof( out ) );
 	
@@ -172,9 +173,18 @@ void strip_html( char *in )
 			while( *in && *in != '>' )
 				in ++;
 			
+			taglen = in - cs - 1;   /* not <0 because the above loop runs at least once */
 			if( *in )
 			{
-				if( g_strncasecmp( cs+1, "br", 2) == 0 )
+				if( g_strncasecmp( cs+1, "b", taglen) == 0 )
+					*(s++) = '\x02';
+				else if( g_strncasecmp( cs+1, "/b", taglen) == 0 )
+					*(s++) = '\x02';
+				else if( g_strncasecmp( cs+1, "i", taglen) == 0 )
+					*(s++) = '\x1f';
+				else if( g_strncasecmp( cs+1, "/i", taglen) == 0 )
+					*(s++) = '\x1f';
+				else if( g_strncasecmp( cs+1, "br", taglen) == 0 )
 					*(s++) = '\n';
 				in ++;
 			}