Changeset 4049061

Timestamp:

2010-03-06T17:10:32Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0714d51

Parents:

17f9522

Message:

Fixed up Yahoo! I'll have to do some more thorough testing of this code
since I may have broken something.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (3 diffs)
• yahoo.c (modified) (5 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)
 {
@@ -4099 +4102 @@
 
         yd = yid->yd;
-
         old_status = yd->current_status;
-
-        if (msg && strncmp(msg,"Invisible",9)) {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-        } else {
-                yd->current_status = state;
-        }
+        yd->current_status = state;
 
         /* Thank you libpurple :) */
@@ -4121 +4118 @@
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
-         
-        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
-                yahoo_packet_hash(pkt, 19, msg);
-        } else {
-                yahoo_packet_hash(pkt, 19, "");
-        }
-        
+        yahoo_packet_hash(pkt, 19, msg);
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);

protocols/yahoo/yahoo.c

@@ -130 +130 @@
 {
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -197 +199 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        char *away;
-        
-        away = NULL;
-        
-        if( state && msg && g_strcasecmp( state, msg ) != 0 )
-        {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-                away = "";
-        }
-        else if( state )
-        {
-                /* Set msg to NULL since (if it isn't NULL already) it's equal
-                   to state. msg must be empty if we want to use an existing
-                   away state. */
-                msg = NULL;
-                
-                away = "";
-                if( g_strcasecmp( state, "Available" ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        away = NULL;
-                }
-                else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
+        
+        if( state )
+        {
+                if( g_strcasecmp( state, "Be Right Back" ) == 0 )
                         yd->current_status = YAHOO_STATUS_BRB;
                 else if( g_strcasecmp( state, "Busy" ) == 0 )
@@ -239 +222 @@
                 else if( g_strcasecmp( state, "Invisible" ) == 0 )
                         yd->current_status = YAHOO_STATUS_INVISIBLE;
-                else if( g_strcasecmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        
-                        away = NULL;
-                }
+                else
+                        yd->current_status = YAHOO_STATUS_CUSTOM;
         }
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, state ? 2 : 0 );
 }
 
@@ -258 +237 @@
         if( m == NULL )
         {
-                m = g_list_append( m, "Available" );
                 m = g_list_append( m, "Be Right Back" );
                 m = g_list_append( m, "Busy" );
@@ -269 +247 @@
                 m = g_list_append( m, "Stepped Out" );
                 m = g_list_append( m, "Invisible" );
-                m = g_list_append( m, GAIM_AWAY_CUSTOM );
         }