Changeset 6bbb939 for protocols/oscar

Timestamp:

2007-04-16T04:01:13Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfc8d58

Parents:

84b045d

Message:

Split serv_got_update() into imcb_buddy_(status|times). (Well, the second
one isn't implemented yet, but I'll do that later.) At last I got rid of
the hack called get_status_string(). And now Yahoo seems to mess up away
messages...

File:

• protocols/oscar/oscar.c (modified) (9 diffs)

protocols/oscar/oscar.c

@@ -365 +365 @@
                    Let's hope nothing will break. ;-) */
         } else {
-                ic->flags |= OPT_CONN_HTML;
+                ic->flags |= OPT_DOES_HTML;
         }
 
@@ -968 +968 @@
         aim_userinfo_t *info;
         time_t time_idle = 0, signon = 0;
-        int type = 0;
-        int caps = 0;
-        char *tmp;
+        int flags = OPT_LOGGED_IN;
+        char *tmp, *state_string = NULL;
 
         va_list ap;
@@ -977 +976 @@
         va_end(ap);
 
-        if (info->present & AIM_USERINFO_PRESENT_CAPABILITIES)
-                caps = info->capabilities;
-        if (info->flags & AIM_FLAG_ACTIVEBUDDY)
-                type |= UC_AB;
-
         if ((!od->icq) && (info->present & AIM_USERINFO_PRESENT_FLAGS)) {
-                if (info->flags & AIM_FLAG_UNCONFIRMED)
-                        type |= UC_UNCONFIRMED;
-                if (info->flags & AIM_FLAG_ADMINISTRATOR)
-                        type |= UC_ADMIN;
-                if (info->flags & AIM_FLAG_AOL)
-                        type |= UC_AOL;
-                if (info->flags & AIM_FLAG_FREE)
-                        type |= UC_NORMAL;
                 if (info->flags & AIM_FLAG_AWAY)
-                        type |= UC_UNAVAILABLE;
-                if (info->flags & AIM_FLAG_WIRELESS)
-                        type |= UC_WIRELESS;
-        }
+                        flags |= OPT_AWAY;
+        }
+        
         if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) {
-                type = (info->icqinfo.status << 7);
                 if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT) &&
                       (info->icqinfo.status != AIM_ICQ_STATE_NORMAL)) {
-                        type |= UC_UNAVAILABLE;
+                        flags |= OPT_AWAY;
                 }
-        }
-
-        if (caps & AIM_CAPS_ICQ)
-                caps ^= AIM_CAPS_ICQ;
+                
+                if( info->icqinfo.status & AIM_ICQ_STATE_DND )
+                        state_string = "Do Not Disturb";
+                else if( info->icqinfo.status & AIM_ICQ_STATE_OUT )
+                        state_string = "Not Available";
+                else if( info->icqinfo.status & AIM_ICQ_STATE_BUSY )
+                        state_string = "Occupied";
+                else if( info->icqinfo.status & AIM_ICQ_STATE_INVISIBLE )
+                        state_string = "Invisible";
+        }
 
         if (info->present & AIM_USERINFO_PRESENT_IDLE) {
@@ -1020 +1010 @@
         g_free(tmp);
 
-        serv_got_update(ic, info->sn, 1, info->warnlevel/10, signon,
-                        time_idle, type, caps);
+        imcb_buddy_status(ic, info->sn, flags, state_string, NULL);
+        /* imcb_buddy_times(ic, info->sn, signon, time_idle); */
 
         return 1;
@@ -1035 +1025 @@
         va_end(ap);
 
-        serv_got_update(ic, info->sn, 0, 0, 0, 0, 0, 0);
+        imcb_buddy_status(ic, info->sn, 0, NULL, NULL );
 
         return 1;
@@ -1046 +1036 @@
         
         if (args->icbmflags & AIM_IMFLAGS_AWAY)
-                flags |= IM_FLAG_AWAY;
+                flags |= OPT_AWAY;
         
         if ((args->icbmflags & AIM_IMFLAGS_UNICODE) || (args->icbmflags & AIM_IMFLAGS_ISO_8859_1)) {
@@ -1821 +1811 @@
         struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
         int ret = 0, len = strlen(message);
-        if (imflags & IM_FLAG_AWAY) {
+        if (imflags & OPT_AWAY) {
                 ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
         } else {
@@ -2445 +2435 @@
 }
 
-static char *oscar_get_status_string( struct im_connection *ic, int number )
-{
-        struct oscar_data *od = ic->proto_data;
-        
-        if( ! number & UC_UNAVAILABLE )
-        {
-                return( NULL );
-        }
-        else if( od->icq )
-        {
-                number >>= 7;
-                if( number & AIM_ICQ_STATE_DND )
-                        return( "Do Not Disturb" );
-                else if( number & AIM_ICQ_STATE_OUT )
-                        return( "Not Available" );
-                else if( number & AIM_ICQ_STATE_BUSY )
-                        return( "Occupied" );
-                else if( number & AIM_ICQ_STATE_INVISIBLE )
-                        return( "Invisible" );
-                else
-                        return( "Away" );
-        }
-        else
-        {
-                return( "Away" );
-        }
-}
-
 int oscar_send_typing(struct im_connection *ic, char * who, int typing)
 {
@@ -2633 +2595 @@
         ret->rem_deny = oscar_rem_deny;
         ret->set_permit_deny = oscar_set_permit_deny;
-        ret->get_status_string = oscar_get_status_string;
         ret->send_typing = oscar_send_typing;