Changeset 279607e

Timestamp:

2010-03-07T22:35:00Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

52cae01

Parents:

fb020ac

Message:

Fixed purple module to work with the new away interface.

File:

• protocols/purple/purple.c (modified) (3 diffs)

protocols/purple/purple.c

@@ -195 +195 @@
         
         for( st = purple_account_get_status_types( pa ); st; st = st->next )
-                ret = g_list_append( ret, (void*) purple_status_type_get_name( st->data ) );
+        {
+                PurpleStatusPrimitive prim = purple_status_type_get_primitive( st->data );
+                if( prim != PURPLE_STATUS_AVAILABLE && prim != PURPLE_STATUS_OFFLINE )
+                        ret = g_list_append( ret, (void*) purple_status_type_get_name( st->data ) );
+        }
         
         return ret;
@@ -205 +209 @@
         GList *status_types = purple_account_get_status_types( pa ), *st;
         PurpleStatusType *pst = NULL;
+        GList *args = NULL;
         
         for( st = status_types; st; st = st->next )
@@ -210 +215 @@
                 pst = st->data;
                 
-                if( g_strcasecmp( state_txt, purple_status_type_get_name( pst ) ) == 0 )
-                        break;
-        }
-        
-        purple_account_set_status( pa, st ? purple_status_type_get_id( pst ) : "away",
-                                   TRUE, "message", message, NULL );
+                if( state_txt == NULL &&
+                    purple_status_type_get_primitive( st->data ) == PURPLE_STATUS_AVAILABLE )
+                        break;
+
+                if( state_txt != NULL &&
+                    g_strcasecmp( state_txt, purple_status_type_get_name( pst ) ) == 0 )
+                        break;
+        }
+        
+        if( message )
+        {
+                args = g_list_append( args, "message" );
+                args = g_list_append( args, message );
+        }
+        
+        purple_account_set_status_list( pa, st ? purple_status_type_get_id( pst ) : "away",
+                                        TRUE, args );
+
+        g_list_free( args );
 }