# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1100577369 0
# Node ID fa4973f356a1e375d63051a3cacd4403b394050c
# Parent  55ea700c49d4c70e3ff19e763be9a771ec07db10
[gaim-migrate @ 11310]
Minor updates to these 2 protocols.  Yahoo! no longer crashes and
oscar is one step closer to being able to set an away message

committer: Tailor Script <tailor@pidgin.im>

diff -r 55ea700c49d4 -r fa4973f356a1 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Nov 16 03:53:41 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Nov 16 03:56:09 2004 +0000
@@ -6876,9 +6876,11 @@
 									 _("Available"), TRUE, TRUE, FALSE);
 	status_types = g_list_append(status_types, type);
 
-	type = gaim_status_type_new_full(GAIM_STATUS_AWAY,
-									 OSCAR_STATUS_ID_AWAY,
-									 _("Away"), TRUE, TRUE, FALSE);
+	type = gaim_status_type_new_with_attrs(GAIM_STATUS_AWAY,
+										   OSCAR_STATUS_ID_AWAY,
+										   _("Away"), TRUE, TRUE, FALSE,
+										   "message", _("Message"),
+										   gaim_value_new(GAIM_TYPE_STRING), NULL);
 	status_types = g_list_append(status_types, type);
 
 	type = gaim_status_type_new_full(GAIM_STATUS_HIDDEN,
diff -r 55ea700c49d4 -r fa4973f356a1 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Tue Nov 16 03:53:41 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Tue Nov 16 03:56:09 2004 +0000
@@ -3033,6 +3033,12 @@
 
 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
 		const char *msg = gaim_status_get_attr_string(status, "message");
+
+		if (msg == NULL) {
+			gaim_debug_info("yahoo", "Attempted to set a NULL status message.\n");
+			msg = "";
+		}
+
 		conv_msg = yahoo_string_encode(gc, msg, NULL);
 		conv_msg2 = gaim_markup_strip_html(conv_msg);
 		yahoo_packet_hash(pkt, 19, conv_msg2);
@@ -3157,7 +3163,7 @@
 		types = g_list_append(types, type);
 
 		type = gaim_status_type_new_with_attrs(GAIM_STATUS_AWAY, "away",
-		                                       "Away", TRUE, TRUE, FALSE,
+		                                       _("Away"), TRUE, TRUE, FALSE,
 		                                       "message", _("Message"),
 		                                       gaim_value_new(GAIM_TYPE_STRING), NULL);
 		types = g_list_append(types, type);