# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137655278 0
# Node ID 563fb4f1e9fc69595b6dad87f7de8d5b8493c3da
# Parent  2e2e1204b2b0493f2150d0c16fd4d1d6da50c3c3
[gaim-migrate @ 15301]
This is the last of my tooltip updates. This hides everything but status and message from non-full tooltips.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2e2e1204b2b0 -r 563fb4f1e9fc src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Thu Jan 19 07:16:07 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Thu Jan 19 07:21:18 2006 +0000
@@ -1020,22 +1020,24 @@
 		const char *sub;
 		GList *l;
 
-		if(jb->subscription & JABBER_SUB_FROM) {
-			if(jb->subscription & JABBER_SUB_TO)
-				sub = _("Both");
-			else if(jb->subscription & JABBER_SUB_PENDING)
-				sub = _("From (To pending)");
-			else
-				sub = _("From");
-		} else {
-			if(jb->subscription & JABBER_SUB_TO)
-				sub = _("To");
-			else if(jb->subscription & JABBER_SUB_PENDING)
-				sub = _("None (To pending)");
-			else
-				sub = _("None");
+		if (full) {
+			if(jb->subscription & JABBER_SUB_FROM) {
+				if(jb->subscription & JABBER_SUB_TO)
+					sub = _("Both");
+				else if(jb->subscription & JABBER_SUB_PENDING)
+					sub = _("From (To pending)");
+				else
+					sub = _("From");
+			} else {
+				if(jb->subscription & JABBER_SUB_TO)
+					sub = _("To");
+				else if(jb->subscription & JABBER_SUB_PENDING)
+					sub = _("None (To pending)");
+				else
+					sub = _("None");
+			}
+			g_string_append_printf(ret, "\n<b>%s:</b> %s", _("Subscription"), sub);
 		}
-		g_string_append_printf(ret, "\n<b>%s:</b> %s", _("Subscription"), sub);
 
 		for(l=jb->resources; l; l = l->next) {
 			char *text = NULL;
diff -r 2e2e1204b2b0 -r 563fb4f1e9fc src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Thu Jan 19 07:16:07 2006 +0000
+++ b/src/protocols/msn/msn.c	Thu Jan 19 07:21:18 2006 +0000
@@ -554,11 +554,17 @@
 							   _("Idle") : gaim_status_get_name(status));
 	}
 
-	if (user)
+	if (full && user)
 	{
 		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
 							   (user->list_op & (1 << MSN_LIST_RL)) ?
 							   _("Yes") : _("No"));
+
+	/* XXX: This is being shown in non-full tooltips because the
+	 * XXX: blocked icon overlay isn't always accurate for MSN.
+	 * XXX: This can die as soon as gaim_privacy_check() knows that
+	 * XXX: this prpl always honors both the allow and deny lists. */
+	if (user)
 		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Blocked"),
 							   (user->list_op & (1 << MSN_LIST_BL)) ?
 							   _("Yes") : _("No"));
diff -r 2e2e1204b2b0 -r 563fb4f1e9fc src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Jan 19 07:16:07 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Jan 19 07:21:18 2006 +0000
@@ -7726,7 +7726,8 @@
 		GaimStatus *status;
 		const char *message;
 
-		oscar_string_append_info(gc, str, "\n", b, userinfo);
+		if (full)
+			oscar_string_append_info(gc, str, "\n", b, userinfo);
 
 		presence = gaim_buddy_get_presence(b);
 		status = gaim_presence_get_active_status(presence);
diff -r 2e2e1204b2b0 -r 563fb4f1e9fc src/protocols/silc/buddy.c
--- a/src/protocols/silc/buddy.c	Thu Jan 19 07:16:07 2006 +0000
+++ b/src/protocols/silc/buddy.c	Thu Jan 19 07:21:18 2006 +0000
@@ -1543,38 +1543,42 @@
 	}
 
 	silcgaim_parse_attrs(client_entry->attrs, &moodstr, &statusstr, &contactstr, &langstr, &devicestr, &tzstr, &geostr);
+
+	if (statusstr) {
+		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Message"), statusstr);
+		g_free(statusstr);
+	}
+
+	if (full) {
 		if (moodstr) {
 			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Mood"), moodstr);
 			g_free(moodstr);
 		}
-	if (statusstr) {
-		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Message"), statusstr);
-		g_free(statusstr);
-	}
 
 		if (contactstr) {
 			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Preferred Contact"), contactstr);
 			g_free(contactstr);
 		}
 
-	if (langstr) {
-		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Preferred Language"), langstr);
-		g_free(langstr);
-	}
+		if (langstr) {
+			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Preferred Language"), langstr);
+			g_free(langstr);
+		}
+
+		if (devicestr) {
+			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Device"), devicestr);
+			g_free(devicestr);
+		}
 
-	if (devicestr) {
-		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Device"), devicestr);
-		g_free(devicestr);
-	}
+		if (tzstr) {
+			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Timezone"), tzstr);
+			g_free(tzstr);
+		}
 
-	if (tzstr) {
-		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Timezone"), tzstr);
-		g_free(tzstr);
-	}
-
-	if (geostr) {
-		g_string_append_printf(s, "\n<b>%s:</b> %s", _("Geolocation"), geostr);
-		g_free(geostr);
+		if (geostr) {
+			g_string_append_printf(s, "\n<b>%s:</b> %s", _("Geolocation"), geostr);
+			g_free(geostr);
+		}
 	}
 
 	buf = g_string_free(s, FALSE);