Changeset 0ebf919 for protocols

Timestamp:

2010-08-21T22:25:37Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c00dd71

Parents:

a758ec1

Message:

Pass "user is mobile" info coming from OSCAR up to BitlBee and show mobile
people as away=Mobile. Bug #462 (and others for other protocols).

Location:

protocols

Files:

• bee.c (modified) (1 diff)
• bee.h (modified) (1 diff)
• bee_user.c (modified) (1 diff)
• nogaim.h (modified) (1 diff)
• oscar/oscar.c (modified) (1 diff)

protocols/bee.c

@@ -40 +40 @@
         s = set_add( &b->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, b );
         s = set_add( &b->set, "debug", "false", set_eval_bool, b );
+        s = set_add( &b->set, "mobile_is_away", "false", set_eval_bool, b );
         s = set_add( &b->set, "save_on_quit", "true", set_eval_bool, b );
         s = set_add( &b->set, "status", NULL, set_eval_away_status, b );

protocols/bee.h

@@ -56 +56 @@
 void bee_free( bee_t *b );
 
+/* TODO(wilmer): Kill at least the OPT_ flags that have an equivalent here. */
 typedef enum
 {
         BEE_USER_ONLINE = 1,    /* Compatibility with old OPT_LOGGED_IN flag */
         BEE_USER_AWAY = 4,      /* Compatibility with old OPT_AWAY flag */
+        BEE_USER_MOBILE = 8,    /* Compatibility with old OPT_MOBILE flag */
         BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
 } bee_user_flags_t;

protocols/bee_user.c

@@ -190 +190 @@
         bu->status_msg = g_strdup( message );
         
+        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 );

protocols/nogaim.h

@@ -63 +63 @@
 #define OPT_LOGGING_OUT 0x00000002
 #define OPT_AWAY        0x00000004
+#define OPT_MOBILE      0x00000008
 #define OPT_DOES_HTML   0x00000010
 #define OPT_LOCALBUDDY  0x00000020 /* For nicks local to one groupchat */

protocols/oscar/oscar.c

@@ -898 +898 @@
                         flags |= OPT_AWAY;
         }
+        
+        /* Maybe this should be done just for AIM contacts, not sure. */
+        if (info->flags & AIM_FLAG_WIRELESS)
+                flags |= OPT_MOBILE;
         
         if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) {