Changeset 8e9e2b7 for protocols/bee_user.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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 mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

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

protocols/bee_user.c

@@ -187 +187 @@
         /* TODO(wilmer): OPT_AWAY, or just state == NULL ? */
         bu->flags = flags;
-        bu->status = g_strdup( ( flags & OPT_AWAY ) && state == NULL ? "Away" : state );
         bu->status_msg = g_strdup( message );
+        if( state && *state )
+                bu->status = g_strdup( state );
+        else if( flags & OPT_AWAY )
+                bu->status = g_strdup( "Away" );
+        else
+                bu->status = NULL;
         
         if( bu->status == NULL && ( flags & OPT_MOBILE ) &&
@@ -205 +210 @@
 }
 
+/* Same, but only change the away/status message, not any away/online state info. */
+void imcb_buddy_status_msg( struct im_connection *ic, const char *handle, const char *message )
+{
+        bee_t *bee = ic->bee;
+        bee_user_t *bu, *old;
+        
+        if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
+        {
+                return;
+        }
+        
+        old = g_memdup( bu, sizeof( bee_user_t ) );
+        
+        bu->status_msg = message && *message ? g_strdup( message ) : NULL;
+        
+        if( bee->ui->user_status )
+                bee->ui->user_status( bee, bu, old );
+        
+        g_free( old->status_msg );
+        g_free( old );
+}
+
 void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle )
 {