# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1074984059 0
# Node ID ac7bf273bd661768c7670c12c098542df9807916
# Parent  8f913260ed5e4a4b8e3d303dcafaea7c8746f159
[gaim-migrate @ 8878]
tweakage

committer: Tailor Script <tailor@pidgin.im>

diff -r 8f913260ed5e -r ac7bf273bd66 src/protocols/jabber/buddy.c
--- a/src/protocols/jabber/buddy.c	Fri Jan 23 05:52:04 2004 +0000
+++ b/src/protocols/jabber/buddy.c	Sat Jan 24 22:40:59 2004 +0000
@@ -744,8 +744,10 @@
 				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
 						_("Role"), text);
 			} else if(text && !strcmp(child->name, "DESC")) {
+				char *text2 = gaim_strdup_withhtml(text);
 				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
-						_("Description"), text);
+						_("Description"), text2);
+				g_free(text2);
 			} else if(!strcmp(child->name, "PHOTO") ||
 					!strcmp(child->name, "LOGO")) {
 				if((child2 = xmlnode_get_child(child, "BINVAL"))) {
@@ -910,16 +912,18 @@
 
 	*/
 
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	if(jb->invisible & JABBER_INVIS_BUDDY) {
-		pbm->label = _("Un-hide From");
-		pbm->callback = jabber_buddy_make_visible;
-	} else {
-		pbm->label = _("Temporarily Hide From");
-		pbm->callback = jabber_buddy_make_invisible;
+	if(js->protocol_version == JABBER_PROTO_0_9) {
+		pbm = g_new0(struct proto_buddy_menu, 1);
+		if(jb->invisible & JABBER_INVIS_BUDDY) {
+			pbm->label = _("Un-hide From");
+			pbm->callback = jabber_buddy_make_visible;
+		} else {
+			pbm->label = _("Temporarily Hide From");
+			pbm->callback = jabber_buddy_make_invisible;
+		}
+		pbm->gc = gc;
+		m = g_list_append(m, pbm);
 	}
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
 
 	if(jb->subscription & JABBER_SUB_FROM) {
 		pbm = g_new0(struct proto_buddy_menu, 1);
diff -r 8f913260ed5e -r ac7bf273bd66 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Fri Jan 23 05:52:04 2004 +0000
+++ b/src/protocols/jabber/jabber.c	Sat Jan 24 22:40:59 2004 +0000
@@ -951,6 +951,7 @@
 
 static GList *jabber_away_states(GaimConnection *gc)
 {
+	JabberStream *js = gc->proto_data;
 	GList *m = NULL;
 
 	m = g_list_append(m, _("Online"));
@@ -958,7 +959,8 @@
 	m = g_list_append(m, _("Away"));
 	m = g_list_append(m, _("Extended Away"));
 	m = g_list_append(m, _("Do Not Disturb"));
-	m = g_list_append(m, _("Invisible"));
+	if(js->protocol_version == JABBER_PROTO_0_9)
+		m = g_list_append(m, _("Invisible"));
 	m = g_list_append(m, GAIM_AWAY_CUSTOM);
 
 	return m;