Changeset e97827b for protocols/yahoo

Timestamp:

2006-10-15T09:31:13Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

69cb623, 93b7bd4

Parents:

3ef6410 (diff), 695e392 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from devel.

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 );
 }