Mercurial > pidgin3 / file diff

--- a/src/protocols/simple/simple.c	Thu Nov 24 20:38:24 2005 +0000
+++ b/src/protocols/simple/simple.c	Thu Nov 24 20:47:46 2005 +0000
@@ -494,14 +494,15 @@
 static void send_sip_request(GaimConnection *gc, gchar *method, gchar *url, gchar *to, gchar *addheaders, gchar *body, struct sip_dialog *dialog, TransCallback tc) {
 	struct simple_account_data *sip = gc->proto_data;
 	char *callid= dialog ? g_strdup(dialog->callid) : gencallid();
+	char *auth="";
+	char *addh="";
+	gchar *branch = genbranch();
+	char *buf;
+
 	if(!strcmp(method,"REGISTER")) {
 		if(sip->regcallid) callid = g_strdup(sip->regcallid);
 		else sip->regcallid = g_strdup(callid);
 	}
-	char *auth="";
-	char *addh="";
-	gchar *branch = genbranch();
-	char *buf;
 
 	if(addheaders) addh=addheaders;
 	if(sip->registrar.type && !strcmp(method,"REGISTER")) {
@@ -713,10 +714,10 @@
 	g_free(hdr);
 }
 
-static int simple_im_send(GaimConnection *gc, const char *who, const char *what, GaimConvImFlags flags) {
+static int simple_im_send(GaimConnection *gc, const char *who, const char *what, GaimMessageFlags flags) {
 	struct simple_account_data *sip = gc->proto_data;
 	char *to = g_strdup(who);
-	char *text = g_strdup(what);
+	char *text = gaim_unescape_html(what);
 	simple_send_message(sip, to, text, NULL);
 	g_free(to);
 	g_free(text);