changeset 10068:f948913f3c33

[gaim-migrate @ 11044] (20:18:34) sanmarcos: remember the patch to show if somebody blocked you in msn?, well I just found out it breaks the display of the away icon on your buddy list (20:18:46) sanmarcos: meaning, a user is away in msn, and the msn dude appears without an away icon overlayed (20:19:43) LSchiere: lovely (20:19:43) sanmarcos: only in the small buddy list though, I might be wrong and maybe it is not the patch (20:19:57) LSchiere: the small list should only show one overlay at a time (20:20:04) LSchiere: so if its showing some other... (20:20:05) sanmarcos: yep (20:20:21) sanmarcos: no, I just trying setting myself away (I dont have mobile or anything setup), and it doesnt show it (20:20:50) sanmarcos: besides setting the mobile number is pretty broken, afaik (20:21:45) sanmarcos: s/trying/tried committer: Tailor Script <[e-mail]>

--- a/pixmaps/status/default/Makefile.am	Mon Sep 27 22:05:27 2004 +0000
+++ b/pixmaps/status/default/Makefile.am	Tue Sep 28 00:22:47 2004 +0000
@@ -36,9 +36,7 @@
 	voice.png \
 	wireless.png \
 	yahoo.png \
-	zephyr.png \
-	blocked.png \
-	nr.png
+	zephyr.png
 
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
 

--- a/src/protocols/msn/msn.c	Mon Sep 27 22:05:27 2004 +0000
+++ b/src/protocols/msn/msn.c	Tue Sep 28 00:22:47 2004 +0000
@@ -394,30 +394,13 @@
 	MsnUser *user;
 	GaimPresence *presence;
 	const char *emblems[4] = { NULL, NULL, NULL, NULL };
-	int i = 1;
+	int i = 0;
 
 	user = b->proto_data;
 	presence = gaim_buddy_get_presence(b);
 
-	if (user == NULL)
-	{
-		emblems[0] = "offline";
-	}
-	else
-	{
-		if (!(user->list_op & (1 << MSN_LIST_RL)))
-			emblems[0] = "nr";
-		if (user->list_op & (1 << MSN_LIST_BL))
-			emblems[i++] = "blocked";
-		if (user->mobile)
-			emblems[i++] = "wireless";
-	}
-
 	if (!gaim_presence_is_online(presence))
-	{
-		if (emblems[0] == NULL)
-			emblems[0] = "offline";
-	}
+		emblems[i++] = "offline";
 	else if (gaim_presence_is_status_active(presence, "busy") ||
 			 gaim_presence_is_status_active(presence, "phone"))
 		emblems[i++] = "occupied";
@@ -425,6 +408,13 @@
 			 gaim_presence_is_idle(presence))
 		emblems[i++] = "away";
 
+	if (user == NULL)
+	{
+		emblems[0] = "offline";
+	}
+	else if (user->mobile)
+		emblems[i++] = "wireless";
+
 	*se = emblems[0];
 	*sw = emblems[1];
 	*nw = emblems[2];
@@ -466,17 +456,9 @@
 							   _("Idle") : gaim_status_get_name(status));
 	}
 
-	if (user)
-	{
-		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Has you"),
-							   (user->list_op & (1 << MSN_LIST_RL)) ?
-							   _("Yes") : _("No"));
-
-		g_string_append_printf(s, _("\n<b>%s:</b> %s"), _("Blocked"),
-							   (user->list_op & (1 << MSN_LIST_BL)) ?
-							   _("Yes") : _("No"));
-	}
-
+	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);
 }