Changeset a36b030 for protocols/yahoo

Timestamp:

2006-07-27T19:18:33Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

54794b8

Parents:

2811940

Message:

The Yahoo! module now properly sets away states instead of away messages.
(So other BitlBees can read your Yahoo! away states better and others can
see the proper icons again.)

File:

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

protocols/yahoo/yahoo.c

@@ -192 +192 @@
         gc->away = NULL;
         
-        if( msg )
+        if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
                 gc->away = "";
         }
-        if( state )
-        {
+        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;
+                
                 gc->away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
@@ -235 +240 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        if( yd->current_status == YAHOO_STATUS_INVISIBLE )
-                yahoo_set_away( yd->y2_id, yd->current_status, NULL, gc->away != NULL );
-        else
-                yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
 }