Mercurial > pidgin3 / file diff

--- a/src/protocols/msn/msn.c	Wed Oct 13 14:40:45 2004 +0000
+++ b/src/protocols/msn/msn.c	Wed Oct 13 17:54:11 2004 +0000
@@ -459,9 +459,12 @@
 							   _("Idle") : gaim_status_get_name(status));
 	}
 
-	g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
-						   (user->list_op & (1 << MSN_LIST_RL)) ?
-						   _("Yes") : _("No"));
+	if (user)
+	{
+		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
+							   (user->list_op & (1 << MSN_LIST_RL)) ?
+							   _("Yes") : _("No"));
+	}
 
 	return g_string_free(s, FALSE);
 }
@@ -1247,7 +1250,6 @@
 
 	if (b)
 	{
-		MsnUser *user;
 		GaimPresence *presence;
 		char *statustext = msn_tooltip_text(b);
 
@@ -1280,15 +1282,13 @@
 
 		if (statustext)
 		{
-			g_string_append_printf(s, "%s<br>", statustext);
+			char *tmp;
+			tmp = gaim_strreplace((*statustext == '\n' ? statustext + 1 : statustext),
+								  "\n", "<br>");
 			g_free(statustext);
+			g_string_append_printf(s, "%s<br>", tmp);
+			g_free(tmp);
 		}
-
-		user = b->proto_data;
-
-		g_string_append_printf(s, _("<b>%s:</b> %s<br>"), _("Has you"),
-							   (user->list_op & (1 << MSN_LIST_RL)) ?
-							   _("Yes") : _("No"));
 	}
 
 	return g_string_free(s, FALSE);