# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1094700048 0
# Node ID 7596ad640b56e7296c8d12c45bc99fedf17ceeb7
# Parent  cc4b2125d05dcba35e632977077f8856e4c05938
[gaim-migrate @ 10905]
Ta-ra-ra-boom de-ay, or something

committer: Tailor Script <tailor@pidgin.im>

diff -r cc4b2125d05d -r 7596ad640b56 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Wed Sep 08 22:58:12 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Sep 09 03:20:48 2004 +0000
@@ -2194,8 +2194,7 @@
 	}
 
 
-	gaim_debug_misc("oscar",
-			   "Reg status: %hu\n", info->regstatus);
+	gaim_debug_misc("oscar", "Reg status: %hu\n", info->regstatus);
 
 	if (info->email) {
 		gaim_debug_misc("oscar", "Email: %s\n", info->email);
@@ -5535,7 +5534,7 @@
 {
 	GaimConnection *gc = gaim_account_get_connection(account);
 	OscarData *od = (OscarData *)gc->proto_data;
-	GaimStatusType *statusType;
+	GaimStatusType *status_type;
 	GaimStatusPrimitive primitive;
 	GaimPresence *presence;
 	const gchar *status_id;
@@ -5544,8 +5543,8 @@
 	char *msg = NULL;
 	gsize msglen = 0;
 
-	statusType = gaim_status_get_type(status);
-	primitive = gaim_status_type_get_primitive(statusType);
+	status_type = gaim_status_get_type(status);
+	primitive = gaim_status_type_get_primitive(status_type);
 	status_id = gaim_status_get_id(status);
 	presence = gaim_account_get_presence(account);
 
@@ -5566,12 +5565,19 @@
 							  "fully connected."));
 
 	status_id = gaim_status_get_name(status);
-	if (status_id == NULL) {
+
+	if (primitive == GAIM_STATUS_AVAILABLE) {
 		aim_locate_setprofile(od->sess, NULL, NULL, 0, NULL, "", 0);
 		return;
 	}
 	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);
@@ -7143,24 +7149,6 @@
 					   _("Cancel"), NULL, gc);
 }
 
-static void oscar_setavailmsg(GaimConnection *gc, char *text) {
-	OscarData *od = (OscarData *)gc->proto_data;
-
-	aim_locate_setprofile(od->sess, NULL, NULL, 0, NULL, "", 0);
-	aim_srv_setavailmsg(od->sess, text);
-}
-
-static void oscar_show_setavailmsg(GaimPluginAction *action)
-{
-	GaimConnection *gc = (GaimConnection *) action->context;
-	gaim_request_input(gc, NULL, _("Available Message:"), NULL,
-					   _("I'm doing work and hoping for a distraction--IM me!"), 
-					   TRUE, FALSE, NULL,
-					   _("OK"), G_CALLBACK(oscar_setavailmsg),
-					   _("Cancel"), NULL,
-					   gc);
-}
-
 static void oscar_show_set_info(GaimPluginAction *action)
 {
 	GaimConnection *gc = (GaimConnection *) action->context;
@@ -7245,12 +7233,6 @@
 		m = g_list_append(m, act);
 	}
 
-	if (!od->icq) {
-		act = gaim_plugin_action_new(_("Set Available Message..."),
-				oscar_show_setavailmsg);
-		m = g_list_append(m, act);
-	}
-
 	act = gaim_plugin_action_new(_("Change Password..."),
 			oscar_change_pass);
 	m = g_list_append(m, act);
@@ -7348,11 +7330,13 @@
 	presence = aim_ssi_getpresence(sess->ssi.local);
 
 	if (value) {
-//		presence |= 0x00400000;
+		/* Based on the packet capture I thought it was the first one */
+		/* Stu thinks it's the second one. */
+		/* presence |= 0x00400000; */
 		presence &= ~0x00020000;
 		aim_ssi_setpresence(sess, presence);
 	} else {
-//		presence &= ~0x00400000;
+		/* presence &= ~0x00400000; */
 		presence |= 0x00020000;
 		aim_ssi_setpresence(sess, presence);
 	}