Changes in protocols/yahoo/yahoo.c [ec55a7d:99c8f13]

File:

• protocols/yahoo/yahoo.c (modified) (5 diffs)

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;
 }
 
@@ -199 +197 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        
-        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 )
+        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 )
                         yd->current_status = YAHOO_STATUS_BRB;
                 else if( g_strcasecmp( state, "Busy" ) == 0 )
@@ -224 +239 @@
                 else if( g_strcasecmp( state, "Invisible" ) == 0 )
                         yd->current_status = YAHOO_STATUS_INVISIBLE;
-                else
-                        yd->current_status = YAHOO_STATUS_CUSTOM;
-        }
-        else if( msg )
-                yd->current_status = YAHOO_STATUS_CUSTOM;
+                else if( g_strcasecmp( state, GAIM_AWAY_CUSTOM ) == 0 )
+                {
+                        yd->current_status = YAHOO_STATUS_AVAILABLE;
+                        
+                        away = NULL;
+                }
+        }
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, state ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
 }
 
@@ -241 +258 @@
         if( m == NULL )
         {
+                m = g_list_append( m, "Available" );
                 m = g_list_append( m, "Be Right Back" );
                 m = g_list_append( m, "Busy" );
@@ -251 +269 @@
                 m = g_list_append( m, "Stepped Out" );
                 m = g_list_append( m, "Invisible" );
+                m = g_list_append( m, GAIM_AWAY_CUSTOM );
         }