aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-04-01 22:03:50 -0400
committerWilmer van der Gaast <wilmer@gaast.net>2010-04-01 22:03:50 -0400
commite63507a356ac94085bcd00048b81d3ce2f27f287 (patch)
treee79f555de087c2eab95c9373e8fd28393733d5fb /protocols
parentd860a8ddf5039f7208bff4c179bc9fe1549da6da (diff)
Synced the values of some old OPT_* flags with BEE_USER_*.
Diffstat (limited to 'protocols')
-rw-r--r--protocols/bee.h4
-rw-r--r--protocols/bee_user.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/protocols/bee.h b/protocols/bee.h
index c36a6b16..be14234b 100644
--- a/protocols/bee.h
+++ b/protocols/bee.h
@@ -44,8 +44,8 @@ void bee_free( bee_t *b );
typedef enum
{
- BEE_USER_ONLINE = 1,
- BEE_USER_AWAY = 2,
+ BEE_USER_ONLINE = 1, /* Compatibility with old OPT_LOGGED_IN flag */
+ BEE_USER_AWAY = 4, /* Compatibility with old OPT_AWAY flag */
} bee_user_flags_t;
typedef struct bee_user
diff --git a/protocols/bee_user.c b/protocols/bee_user.c
index 66e25faf..32022dd8 100644
--- a/protocols/bee_user.c
+++ b/protocols/bee_user.c
@@ -128,8 +128,7 @@ void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags,
old = g_memdup( bu, sizeof( bee_user_t ) );
/* TODO(wilmer): OPT_AWAY, or just state == NULL ? */
- bu->flags = ( flags & OPT_LOGGED_IN ? BEE_USER_ONLINE : 0 ) |
- ( flags & OPT_AWAY ? BEE_USER_AWAY : 0 );
+ bu->flags = flags;
bu->status = g_strdup( ( flags & OPT_AWAY ) && state == NULL ? "Away" : state );
bu->status_msg = g_strdup( message );