# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1133827542 0
# Node ID 7f1c4630799c72284bf568b86af7f0ffdc1d545c
# Parent  6fd82071a7b88583f946bc148012126800173c88
[gaim-migrate @ 14669]
Deal with idle and available oscar buddy status text correctly?

committer: Tailor Script <tailor@pidgin.im>

diff -r 6fd82071a7b8 -r 7f1c4630799c src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Mon Dec 05 23:54:34 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Dec 06 00:05:42 2005 +0000
@@ -7638,8 +7638,9 @@
 		else
 			ret = g_strdup(_("Offline"));
 	}
-	else if (gaim_presence_is_available(presence) && !strcmp(id, OSCAR_STATUS_ID_AVAILABLE))
+	else if (gaim_status_is_available(status) && !strcmp(id, OSCAR_STATUS_ID_AVAILABLE))
 	{
+		/* Available */
 		message = gaim_status_get_attr_string(status, "message");
 		if (message != NULL)
 		{
@@ -7647,8 +7648,9 @@
 			gaim_util_chrreplace(ret, '\n', ' ');
 		}
 	}
-	else if (!gaim_presence_is_available(presence) && !strcmp(id, OSCAR_STATUS_ID_AWAY))
+	else if (!gaim_status_is_available(status) && !strcmp(id, OSCAR_STATUS_ID_AWAY))
 	{
+		/* Away */
 		message = gaim_status_get_attr_string(status, "message");
 		if (message != NULL)
 		{