Changeset 4022b68 for protocols/bee_user.c

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (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:

Merge mainline.

File:

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

protocols/bee_user.c

@@ -195 +195 @@
                 bu->status = NULL;
         
+        if( bu->status == NULL && ( flags & OPT_MOBILE ) &&
+            set_getbool( &bee->set, "mobile_is_away" ) )
+        {
+                bu->flags |= BEE_USER_AWAY;
+                bu->status = g_strdup( "Mobile" );
+        }
+        
         if( bee->ui->user_status )
                 bee->ui->user_status( bee, bu, old );
@@ -268 +275 @@
 }
 
-void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
+void imcb_buddy_typing( struct im_connection *ic, const char *handle, uint32_t flags )
 {
         bee_user_t *bu;