# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1094702930 0
# Node ID 792a7409f6b0b2de1aa92ad91361c965e4a6515e
# Parent  e651dbb88773d5e2979c11585f35fa85d7245ac7
[gaim-migrate @ 10908]
Baby steps to the kitchen...

Look man, just because I have a goldfish around my neck doesn't mean
I'm crazy!

committer: Tailor Script <tailor@pidgin.im>

diff -r e651dbb88773 -r 792a7409f6b0 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Sep 09 03:56:47 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Sep 09 04:08:50 2004 +0000
@@ -5564,20 +5564,28 @@
 							  "state; try setting it again when you are "
 							  "fully connected."));
 
-	status_id = gaim_status_get_name(status);
-
 	if (primitive == GAIM_STATUS_AVAILABLE) {
 		aim_locate_setprofile(od->sess, NULL, NULL, 0, NULL, "", 0);
+#if 0
+		/* Set an available message */
+		aim_locate_setprofile(od->sess, NULL, NULL, 0, NULL, "", 0);
+		aim_srv_setavailmsg(od->sess, text);
+#endif
 		return;
 	}
+
+	/*
+	 * XXX - Using status_id below is definitely wrong.  We want to get
+	 * the away message that the Gaim user just set.  We probably want
+	 * to get a certain attribute from status->attr_values, but I don't
+	 * think any of that is implemented yet.
+	 *
+	 * Something like
+	 * text_html = gaim_status_get_attr_string(status, "message");
+	 */
+	status_id = gaim_status_get_name(status);
 	text_html = gaim_strdup_withhtml(status_id);
 
-#if 0
-	/* Set an available message */
-	aim_locate_setprofile(od->sess, NULL, NULL, 0, NULL, "", 0);
-	aim_srv_setavailmsg(od->sess, text);
-#endif
-
 	charset = oscar_charset_check(text_html);
 	if (charset == AIM_CHARSET_UNICODE) {
 		msg = g_convert(text_html, strlen(text_html), "UCS-2BE", "UTF-8", NULL, &msglen, NULL);