Changeset be915f5

Timestamp:

2010-03-06T18:19:31Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34fbbf9

Parents:

0714d51

Message:

Yahoo! fixes. Turns out the protocol really is somewhat odd.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (2 diffs)
• yahoo.c (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -4087 +4087 @@
 }
 
-/* TODO(wilmer): See if this this function still works since I got rid of a
-                 lot of things that seemed illogical. Some things may have
-                 been intentional. */
 void yahoo_set_away(int id, enum yahoo_status state, const char *msg, int away)
 {
@@ -4118 +4115 @@
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
-        yahoo_packet_hash(pkt, 19, msg);
+        yahoo_packet_hash(pkt, 19, msg && state == YAHOO_STATUS_CUSTOM ? msg : "");
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
         yahoo_send_packet(yid, pkt, 0);

protocols/yahoo/yahoo.c

@@ -200 +200 @@
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
         
-        if( state )
-        {
+        if( state && msg == NULL )
+        {
+                /* Use these states only if msg doesn't contain additional
+                   info since away messages are only supported with CUSTOM. */
                 if( g_strcasecmp( state, "Be Right Back" ) == 0 )
                         yd->current_status = YAHOO_STATUS_BRB;
@@ -225 +227 @@
                         yd->current_status = YAHOO_STATUS_CUSTOM;
         }
+        else if( state )
+                yd->current_status = YAHOO_STATUS_CUSTOM;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;