Merging mainline.

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/misc.c b/lib/misc.c
index 35e9909b..fe2ff17c 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -33,6 +33,7 @@
 #define BITLBEE_CORE
 #include "nogaim.h"
 #include "base64.h"
+#include "md5.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -88,6 +89,7 @@ static const htmlentity_t ent[] =
 	{ "lt",     "<" },
 	{ "gt",     ">" },
 	{ "amp",    "&" },
+	{ "apos",   "'" },
 	{ "quot",   "\"" },
 	{ "aacute", "á" },
 	{ "eacute", "é" },
@@ -521,7 +523,7 @@ struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain )
 }
 
 /* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
-char *word_wrap( char *msg, int line_len )
+char *word_wrap( const char *msg, int line_len )
 {
 	GString *ret = g_string_sized_new( strlen( msg ) + 16 );
 	
diff --git a/lib/misc.h b/lib/misc.h
index 5376cd22..ce36caf5 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -61,7 +61,7 @@ G_MODULE_EXPORT int bool2int( char *value );
 
 G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
 
-G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
+G_MODULE_EXPORT char *word_wrap( const char *msg, int line_len );
 
 G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );