Changeset 6e9ae72 for protocols

Timestamp:

2011-12-17T13:50:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

Location:

protocols

Files:

• jabber/io.c (modified) (2 diffs)
• jabber/jabber.c (modified) (1 diff)
• jabber/s5bytestream.c (modified) (3 diffs)
• msn/ns.c (modified) (1 diff)
• msn/sb.c (modified) (4 diffs)
• msn/soap.c (modified) (5 diffs)
• nogaim.c (modified) (1 diff)
• oscar/chat.c (modified) (2 diffs)
• oscar/chatnav.c (modified) (2 diffs)
• oscar/icq.c (modified) (2 diffs)
• oscar/im.c (modified) (4 diffs)
• oscar/misc.c (modified) (2 diffs)
• oscar/oscar.c (modified) (14 diffs)
• oscar/rxqueue.c (modified) (1 diff)
• oscar/service.c (modified) (4 diffs)
• purple/purple.c (modified) (2 diffs)
• skype/.bzrignore (added)
• skype/.mailmap (added)
• skype/HACKING (added)
• skype/Makefile (added)
• skype/NEWS (added)
• skype/README (added)
• skype/asciidoc.conf (added)
• skype/client.sh (added)
• skype/skype.c (added)
• skype/skyped.cnf (added)
• skype/skyped.conf.dist (added)
• skype/skyped.py (added)
• skype/skyped.txt (added)
• skype/t/Makefile (added)
• skype/t/bitlbee.conf (added)
• skype/t/irssi/livetest-irssi.sh (added)
• skype/t/irssi/skype-call.test (added)
• skype/t/irssi/skype-info.test (added)
• skype/t/irssi/skype-login.test (added)
• skype/t/irssi/skype-msg.test (added)
• skype/t/irssi/trigger.pl (added)
• skype/t/livetest-bitlbee.sh (added)
• twitter/twitter.c (modified) (15 diffs)
• twitter/twitter.h (modified) (2 diffs)
• twitter/twitter_lib.c (modified) (22 diffs)
• twitter/twitter_lib.h (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (26 diffs)

protocols/jabber/io.c

@@ -212 +212 @@
                                    this is an old server that can't do SASL
                                    authentication. */
-                                if( !sasl_supported( ic ) )
+                                if( !set_getbool( &ic->acc->set, "sasl") || !sasl_supported( ic ) )
                                 {
                                         /* If there's no version= tag, we suppose
@@ -375 +375 @@
            other way. jabber.com doesn't seem to do SASL while it pretends
            to be XMPP 1.0 compliant! */
-        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && sasl_supported( ic ) )
+        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && set_getbool( &ic->acc->set, "sasl") && sasl_supported( ic ) )
         {
                 if( !jabber_init_iq_auth( ic ) )

protocols/jabber/jabber.c

@@ -84 +84 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         

protocols/jabber/s5bytestream.c

@@ -877 +877 @@
 
         if( ( ( host = strchr( proxy, ',' ) ) == 0 ) ||
-             ( ( port = strchr( host+1, ',' ) ) == 0 ) ) {
+            ( ( port = strchr( host+1, ',' ) ) == 0 ) )
+        {
                 imcb_log( ic, "Error parsing proxy setting: \"%s\" (ignored)", proxy );
                 return NULL;
@@ -889 +890 @@
         sh->jid = g_strdup( jid );
         sh->host = g_strdup( host );
-        strcpy( sh->port, port );
+        g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
 
         return sh;
@@ -915 +916 @@
                                 sh->jid = g_strdup( tf->ini_jid );
                                 sh->host = g_strdup( host );
-                                strcpy( sh->port, port );
+                                g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );
 

protocols/msn/ns.c

@@ -480 +480 @@
                 else
                 {
-                        imcb_error( ic, "Session terminated by remote server (reason unknown)" );
+                        imcb_error( ic, "Session terminated by remote server (%s)",
+                                    cmd[1] ? cmd[1] : "reason unknown)" );
                 }
                 

protocols/msn/sb.c

@@ -308 +308 @@
         struct msn_switchboard *sb = data;
         struct im_connection *ic;
-        struct msn_data *md;
         char buf[1024];
         
@@ -316 +315 @@
         
         ic = sb->ic;
-        md = ic->proto_data;
         
         if( source != sb->fd )
@@ -675 +673 @@
         struct im_connection *ic = sb->ic;
         char *body;
-        int blen = 0;
         
         if( !num_parts )
@@ -681 +678 @@
         
         if( ( body = strstr( msg, "\r\n\r\n" ) ) )
-        {
                 body += 4;
-                blen = msglen - ( body - msg );
-        }
         
         if( strcmp( cmd[0], "MSG" ) == 0 )

protocols/msn/soap.c

@@ -210 +210 @@
 {
         char *s;
-        int st;
         
         if( !getenv( "BITLBEE_DEBUG" ) )
                 return;
         
-        if( ( s = strstr( headers, "\r\n\r\n" ) ) )
-                st = write( 1, s, s - headers + 4 );
-        else
-                st = write( 1, headers, strlen( headers ) );
-        
-#ifdef DEBUG
+        if( headers )
+        {
+                if( ( s = strstr( headers, "\r\n\r\n" ) ) )
+                        write( 2, headers, s - headers + 4 );
+                else
+                        write( 2, headers, strlen( headers ) );
+        }
+        
+        if( payload )
         {
                 struct xt_node *xt = xt_from_string( payload );
@@ -227 +229 @@
                 xt_free_node( xt );
         }
-#endif
 }
 
@@ -661 +662 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%p %s %d\n", bu, handle, bd->flags );
+                fprintf( stderr, "%p %s %d\n", bu, handle, bd->flags );
         
         return XT_HANDLED;
@@ -808 +809 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s\n", id, name );
+                fprintf( stderr, "%s %s\n", id, name );
         
         return XT_HANDLED;
@@ -869 +870 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s %s %s\n", id, type, handle, display_name );
+                fprintf( stderr, "%s %s %s %s\n", id, type, handle, display_name );
         
         return XT_HANDLED;

protocols/nogaim.c

@@ -216 +216 @@
         if( a )
                 /* FIXME(wilmer): ui_log callback or so */
-                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->tag, text );
         else
-                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );

protocols/oscar/chat.c

@@ -384 +384 @@
         char *roomname = NULL;
         struct aim_chat_roominfo roominfo;
-        guint16 tlvcount = 0;
         aim_tlvlist_t *tlvlist;
         char *roomdesc = NULL;
@@ -401 +400 @@
         }
 
-        tlvcount = aimbs_get16(bs);
+        aimbs_get16(bs); /* tlv count */
 
         /*

protocols/oscar/chatnav.c

@@ -139 +139 @@
                  * Type 0x0002: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x0002, 1)) {
-                        guint16 classperms;
-
-                        classperms = aim_gettlv16(innerlist, 0x0002, 1);
-                        
-                }
+                if (aim_gettlv(innerlist, 0x0002, 1))
+                        ;
 
                 /*
@@ -205 +201 @@
                  */
                 if (aim_gettlv(innerlist, 0x00d5, 1)) {
-                        guint8 createperms;
-
-                        createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+                        aim_gettlv8(innerlist, 0x00d5, 1); /* createperms */
                 }
 

protocols/oscar/icq.c

@@ -235 +235 @@
         aim_tlv_t *datatlv;
         aim_bstream_t qbs;
-        guint32 ouruin;
-        guint16 cmdlen, cmd, reqid;
+        guint16 cmd, reqid;
 
         if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
@@ -246 +245 @@
         aim_bstream_init(&qbs, datatlv->value, datatlv->length);
 
-        cmdlen = aimbs_getle16(&qbs);
-        ouruin = aimbs_getle32(&qbs);
+        aimbs_getle16(&qbs); /* cmdlen */
+        aimbs_getle32(&qbs); /* ouruin */
         cmd = aimbs_getle16(&qbs);
         reqid = aimbs_getle16(&qbs);

protocols/oscar/im.c

@@ -919 +919 @@
         int i, ret = 0;
         aim_rxcallback_t userfunc;
-        guint8 cookie[8];
         guint16 channel;
         aim_tlvlist_t *tlvlist;
@@ -931 +930 @@
         /* ICBM Cookie. */
         for (i = 0; i < 8; i++)
-                cookie[i] = aimbs_get8(bs);
+                aimbs_get8(bs);
 
         /* Channel ID */
@@ -1414 +1413 @@
 {
         guint16 hdrlen, msglen, dc;
-        guint8 msgtype, msgflags;
+        guint8 msgtype;
     guint8 *plugin;
     int i = 0, tmp = 0;
@@ -1442 +1441 @@
 
         msgtype = aimbs_getle8(servdata);
-        msgflags = aimbs_getle8(servdata);
+        aimbs_getle8(servdata); /* msgflags */
 
         aim_bstream_advance(servdata, 0x04); /* status code and priority code */

protocols/oscar/misc.c

@@ -310 +310 @@
 {
         aim_frame_t *fr;
-        aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
 
@@ -330 +329 @@
                 return -ENOMEM;
 
-        snacid = aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
+        aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
 
         aim_putsnac(&fr->data, 0x0002, 0x000f, 0x0000, 0);

protocols/oscar/oscar.c

@@ -1072 +1072 @@
 static void gaim_icq_authgrant(void *data_) {
         struct icq_auth *data = data_;
-        char *uin, message;
+        char *uin;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
         
         uin = g_strdup_printf("%u", data->uin);
-        message = 0;
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
+        // char *message = 0;
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
         imcb_ask_add(data->ic, uin, NULL);
@@ -1219 +1219 @@
 static int gaim_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...) {
         va_list ap;
-        guint16 chan, nummissed, reason;
+        guint16 nummissed, reason;
         aim_userinfo_t *userinfo;
 
         va_start(ap, fr);
-        chan = (guint16)va_arg(ap, unsigned int);
+        va_arg(ap, unsigned int); /* chan */
         userinfo = va_arg(ap, aim_userinfo_t *);
         nummissed = (guint16)va_arg(ap, unsigned int);
@@ -1335 +1335 @@
 
 static int gaim_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...) {
-        char *msg;
         guint16 id;
         va_list ap;
@@ -1341 +1340 @@
         va_start(ap, fr);
         id  = (guint16)va_arg(ap, unsigned int);
-        msg = va_arg(ap, char *);
+        va_arg(ap, char *); /* msg */
         va_end(ap);
 
@@ -1361 +1360 @@
         switch(type) {
                 case 0x0002: {
-                        guint8 maxrooms;
-                        struct aim_chat_exchangeinfo *exchanges;
-                        int exchangecount; // i;
-
-                        maxrooms = (guint8)va_arg(ap, unsigned int);
-                        exchangecount = va_arg(ap, int);
-                        exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
+                        va_arg(ap, unsigned int); /* maxrooms */
+                        va_arg(ap, int); /* exchangecount */
+                        va_arg(ap, struct aim_chat_exchangeinfo *); /* exchanges */
                         va_end(ap);
 
@@ -1380 +1375 @@
                         break;
                 case 0x0008: {
-                        char *fqcn, *name, *ck;
-                        guint16 instance, flags, maxmsglen, maxoccupancy, unknown, exchange;
-                        guint8 createperms;
-                        guint32 createtime;
-
-                        fqcn = va_arg(ap, char *);
+                        char *ck;
+                        guint16 instance, exchange;
+
+                        va_arg(ap, char *); /* fqcn */
                         instance = (guint16)va_arg(ap, unsigned int);
                         exchange = (guint16)va_arg(ap, unsigned int);
-                        flags = (guint16)va_arg(ap, unsigned int);
-                        createtime = va_arg(ap, guint32);
-                        maxmsglen = (guint16)va_arg(ap, unsigned int);
-                        maxoccupancy = (guint16)va_arg(ap, unsigned int);
-                        createperms = (guint8)va_arg(ap, int);
-                        unknown = (guint16)va_arg(ap, unsigned int);
-                        name = va_arg(ap, char *);
+                        va_arg(ap, unsigned int); /* flags */
+                        va_arg(ap, guint32); /* createtime */
+                        va_arg(ap, unsigned int); /* maxmsglen */
+                        va_arg(ap, unsigned int); /* maxoccupancy */
+                        va_arg(ap, int); /* createperms */
+                        va_arg(ap, unsigned int); /* unknown */
+                        va_arg(ap, char *); /* name */
                         ck = va_arg(ap, char *);
                         va_end(ap);
@@ -1456 +1449 @@
 static int gaim_chat_info_update(aim_session_t *sess, aim_frame_t *fr, ...) {
         va_list ap;
-        aim_userinfo_t *userinfo;
-        struct aim_chat_roominfo *roominfo;
-        char *roomname;
-        int usercount;
-        char *roomdesc;
-        guint16 unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
-        guint32 creationtime;
+        guint16 maxmsglen, maxvisiblemsglen;
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *ccon = find_oscar_chat_by_conn(ic, fr->conn);
 
         va_start(ap, fr);
-        roominfo = va_arg(ap, struct aim_chat_roominfo *);
-        roomname = va_arg(ap, char *);
-        usercount= va_arg(ap, int);
-        userinfo = va_arg(ap, aim_userinfo_t *);
-        roomdesc = va_arg(ap, char *);
-        unknown_c9 = (guint16)va_arg(ap, int);
-        creationtime = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, struct aim_chat_roominfo *); /* roominfo */
+        va_arg(ap, char *); /* roomname */
+        va_arg(ap, int); /* usercount */
+        va_arg(ap, aim_userinfo_t *); /* userinfo */
+        va_arg(ap, char *); /* roomdesc */
+        va_arg(ap, int); /* unknown_c9 */
+        va_arg(ap, unsigned long); /* creationtime */
         maxmsglen = (guint16)va_arg(ap, int);
-        unknown_d2 = (guint16)va_arg(ap, int);
-        unknown_d5 = (guint16)va_arg(ap, int);
+        va_arg(ap, int); /* unknown_d2 */
+        va_arg(ap, int); /* unknown_d5 */
         maxvisiblemsglen = (guint16)va_arg(ap, int);
         va_end(ap);
@@ -1517 +1504 @@
 #endif
         va_list ap;
-        guint16 code, rateclass;
-        guint32 windowsize, clear, alert, limit, disconnect, currentavg, maxavg;
+        guint16 code;
+        guint32 windowsize, clear, currentavg;
 
         va_start(ap, fr); 
         code = (guint16)va_arg(ap, unsigned int);
-        rateclass= (guint16)va_arg(ap, unsigned int);
+        va_arg(ap, unsigned int); /* rateclass */
         windowsize = (guint32)va_arg(ap, unsigned long);
         clear = (guint32)va_arg(ap, unsigned long);
-        alert = (guint32)va_arg(ap, unsigned long);
-        limit = (guint32)va_arg(ap, unsigned long);
-        disconnect = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, unsigned long); /* alert */
+        va_arg(ap, unsigned long); /* limit */
+        va_arg(ap, unsigned long); /* disconnect */
         currentavg = (guint32)va_arg(ap, unsigned long);
-        maxavg = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, unsigned long); /* maxavg */
         va_end(ap);
 
@@ -2102 +2089 @@
                                 aim_ssi_addbuddies( sess, fr->conn, OSCAR_GROUP, &list, 1, 1 );
                         }
+                        else if( st == 0x0A )
+                        {
+                                imcb_error( sess->aux_data, "Buddy %s is already in your list", list );
+                        }
                         else
                         {
@@ -2413 +2404 @@
         struct im_connection * ic = sess->aux_data;
         va_list ap;
-        guint16 type1, type2;
+        guint16 type2;
         char * sn;
 
         va_start(ap, fr);
-        type1 = va_arg(ap, int);
+        va_arg(ap, int); /* type1 */
         sn = va_arg(ap, char*);
         type2 = va_arg(ap, int);
@@ -2537 +2528 @@
 
         if((cur = aim_getconn_type(od->sess, AIM_CONN_TYPE_CHATNAV))) {
-                int st;
-                
-                st = aim_chatnav_createroom(od->sess, cur, room, exchange_number);
+                aim_chatnav_createroom(od->sess, cur, room, exchange_number);
                 
                 return ret;
@@ -2566 +2555 @@
         static int chat_id = 0;
         char * chatname, *s;
-        struct groupchat *c;
         
         chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
@@ -2575 +2563 @@
                         *s = '0';
         
-        c = imcb_chat_new(ic, chatname);
         ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4);
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
@@ -2581 +2568 @@
         g_free(chatname);
         
-        return NULL;
+        return ret;
 }
 

protocols/oscar/rxqueue.c

@@ -388 +388 @@
          */
         if (aimbs_get8(&flaphdr) != 0x2a) {
-                guint8 start;
-
                 aim_bstream_rewind(&flaphdr);
-                start = aimbs_get8(&flaphdr);
+                aimbs_get8(&flaphdr);
                 imcb_error(sess->aux_data, "FLAP framing disrupted");
                 aim_conn_close(conn);

protocols/oscar/service.c

@@ -563 +563 @@
         groupcount = aimbs_get16(bs);
         for (i = 0; i < groupcount; i++) {
-                guint16 group;
-
-                group = aimbs_get16(bs);
+                aimbs_get16(bs);
 
                 imcb_error(sess->aux_data, "bifurcated migration unsupported");
@@ -701 +699 @@
 static int hostversions(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
-        int vercount;
         guint8 *versions;
 
         /* This is frivolous. (Thank you SmarterChild.) */
-        vercount = aim_bstream_empty(bs)/4;
+        aim_bstream_empty(bs); /* == vercount * 4 */
         versions = aimbs_getraw(bs, aim_bstream_empty(bs));
         g_free(versions);
@@ -731 +728 @@
         aim_tlvlist_t *tl = NULL;
         guint32 data;
-        int tlvlen;
         struct im_connection *ic = sess ? sess->aux_data : NULL;
 
@@ -739 +735 @@
                 data |= AIM_ICQ_STATE_WEBAWARE;
 
-        tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
+        aim_addtlvtochain32(&tl, 0x0006, data); /* tlvlen */
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))

protocols/purple/purple.c

@@ -181 +181 @@
                         /** No way to talk to the user right now, invent one when
                         this becomes important.
-                        irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
+                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
                         */
@@ -750 +750 @@
                 if( bud->server_alias )
                         imcb_rename_buddy( ic, bud->name, bud->server_alias );
+                else if( bud->alias )
+                        imcb_rename_buddy( ic, bud->name, bud->alias );
                 
                 if( group )

protocols/twitter/twitter.c

@@ -30 +30 @@
 
 #define twitter_msg( ic, fmt... ) \
-        do {                                                        \
-                struct twitter_data *td = ic->proto_data;           \
-                if( td->home_timeline_gc )                          \
-                        imcb_chat_log( td->home_timeline_gc, fmt ); \
-                else                                                \
-                        imcb_log( ic, fmt );                        \
+        do {                                            \
+                struct twitter_data *td = ic->proto_data;   \
+                if( td->timeline_gc )                       \
+                        imcb_chat_log( td->timeline_gc, fmt );  \
+                else                                        \
+                        imcb_log( ic, fmt );                    \
         } while( 0 );
 
@@ -52 +52 @@
 
         // Do stuff..
-        twitter_get_home_timeline(ic, -1);
+        twitter_get_timeline(ic, -1);
 
         // If we are still logged in run this function again after timeout.
@@ -69 +69 @@
         // Queue the main_loop
         // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+        td->main_loop_id =
+            b_timeout_add(set_getint(&ic->acc->set, "fetch_interval") * 1000, twitter_main_loop, ic);
 }
 
@@ -77 +78 @@
 {
         struct twitter_data *td = ic->proto_data;
+
+        td->flags &= ~TWITTER_DOING_TIMELINE;
 
         if (set_getbool(&ic->acc->set, "oauth") && !td->oauth_info)
@@ -90 +93 @@
 
 static const struct oauth_service twitter_oauth = {
-        "http://api.twitter.com/oauth/request_token",
-        "http://api.twitter.com/oauth/access_token",
+        "https://api.twitter.com/oauth/request_token",
+        "https://api.twitter.com/oauth/access_token",
         "https://api.twitter.com/oauth/authorize",
         .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
@@ -98 +101 @@
 
 static const struct oauth_service identica_oauth = {
-        "http://identi.ca/api/oauth/request_token",
-        "http://identi.ca/api/oauth/access_token",
+        "https://identi.ca/api/oauth/request_token",
+        "https://identi.ca/api/oauth/access_token",
         "https://identi.ca/api/oauth/authorize",
         .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da",
@@ -216 +219 @@
                 def_oauth = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
-
                 def_url = IDENTICA_API_URL;
                 def_oauth = "false";
@@ -228 +230 @@
         s = set_add(&acc->set, "commands", "true", set_eval_bool, acc);
 
+        s = set_add(&acc->set, "fetch_interval", "60", set_eval_int, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "fetch_mentions", "true", set_eval_bool, acc);
+
         s = set_add(&acc->set, "message_length", "140", set_eval_int, acc);
 
@@ -235 +242 @@
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
 
         s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
@@ -317 +326 @@
         b_event_remove(td->main_loop_id);
 
-        if (td->home_timeline_gc)
-                imcb_chat_free(td->home_timeline_gc);
+        if (td->timeline_gc)
+                imcb_chat_free(td->timeline_gc);
 
         if (td) {
@@ -404 +413 @@
         struct twitter_data *td = c->ic->proto_data;
 
-        if (c != td->home_timeline_gc)
+        if (c != td->timeline_gc)
                 return;         /* WTF? */
 
         /* If the user leaves the channel: Fine. Rejoin him/her once new
            tweets come in. */
-        imcb_chat_free(td->home_timeline_gc);
-        td->home_timeline_gc = NULL;
+        imcb_chat_free(td->timeline_gc);
+        td->timeline_gc = NULL;
 }
 
@@ -465 +474 @@
                 guint64 id;
 
-                if (cmd[1])
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
-                else
-                        id = td->last_status_id;
-
-                /* TODO: User feedback. */
-                if (id)
+                if (cmd[1] == NULL)
+                        twitter_status_destroy(ic, td->last_status_id);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log)
+                                id = td->log[id].id;
+                        
                         twitter_status_destroy(ic, id);
-                else
+                } else
                         twitter_msg(ic, "Could not undo last action");
 
@@ -491 +499 @@
                 guint64 id;
 
-                if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log)
+                                id = td->log[id].id;
+                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
                     (tud = bu->data) && tud->last_id)
                         id = tud->last_id;
-                else {
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1){
                         if (id < TWITTER_LOG_LENGTH && td->log)
                                 id = td->log[id].id;
@@ -514 +525 @@
                 guint64 id = 0;
 
-                if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1 &&
+                    (id < TWITTER_LOG_LENGTH) && td->log) {
+                        bu = td->log[id].bu;
+                        if (g_slist_find(ic->bee->users, bu))
+                                id = td->log[id].id;
+                        else
+                                bu = NULL;
+                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
                     (tud = bu->data) && tud->last_id) {
                         id = tud->last_id;
@@ -525 +544 @@
                                 bu = NULL;
                 }
+
                 if (!id || !bu) {
                         twitter_msg(ic, "User `%s' does not exist or didn't "

protocols/twitter/twitter.h

@@ -36 +36 @@
 {
         TWITTER_HAVE_FRIENDS = 1,
+        TWITTER_DOING_TIMELINE = 0x10000,
+        TWITTER_GOT_TIMELINE = 0x20000,
+        TWITTER_GOT_MENTIONS = 0x40000,
 } twitter_flags_t;
 
@@ -44 +47 @@
         char* user;
         struct oauth_info *oauth_info;
+
+        gpointer home_timeline_obj;
+        gpointer mentions_obj;
+
+        guint64 timeline_id;
+
         GSList *follow_ids;
         
-        guint64 home_timeline_id;
         guint64 last_status_id; /* For undo */
         gint main_loop_id;
-        struct groupchat *home_timeline_gc;
+        struct groupchat *timeline_gc;
         gint http_fails;
         twitter_flags_t flags;

protocols/twitter/twitter_lib.c

@@ -78 +78 @@
         if (txu == NULL)
                 return;
+
         g_free(txu->name);
         g_free(txu->screen_name);
@@ -83 +84 @@
 }
 
-
 /**
  * Frees a twitter_xml_status struct.
@@ -89 +89 @@
 static void txs_free(struct twitter_xml_status *txs)
 {
+        if (txs == NULL)
+                return;
+
         g_free(txs->text);
         txu_free(txs->user);
@@ -103 +106 @@
         if (txl == NULL)
                 return;
-        for (l = txl->list; l; l = g_slist_next(l))
-                if (txl->type == TXL_STATUS)
+
+        for (l = txl->list; l; l = g_slist_next(l)) {
+                if (txl->type == TXL_STATUS) {
                         txs_free((struct twitter_xml_status *) l->data);
-                else if (txl->type == TXL_ID)
+                } else if (txl->type == TXL_ID) {
                         g_free(l->data);
-                else if (txl->type == TXL_USER)
+                } else if (txl->type == TXL_USER) {
                         txu_free(l->data);
+                }
+        }
+
         g_slist_free(txl->list);
         g_free(txl);
@@ -115 +122 @@
 
 /**
- * Add a buddy if it is not allready added, set the status to logged in.
+ * Compare status elements
+ */
+static gint twitter_compare_elements(gconstpointer a, gconstpointer b)
+{
+        struct twitter_xml_status *a_status = (struct twitter_xml_status *) a;
+        struct twitter_xml_status *b_status = (struct twitter_xml_status *) b;
+
+        if (a_status->created_at < b_status->created_at) {
+                return -1;
+        } else if (a_status->created_at > b_status->created_at) {
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+/**
+ * Add a buddy if it is not already added, set the status to logged in.
  */
 static void twitter_add_buddy(struct im_connection *ic, char *name, const char *fullname)
@@ -132 +156 @@
                            exact Twitter username. */
                         imcb_buddy_nick_hint(ic, name, name);
-                        imcb_chat_add_buddy(td->home_timeline_gc, name);
+                        imcb_chat_add_buddy(td->timeline_gc, name);
                 } else if (g_strcasecmp(mode, "many") == 0)
                         imcb_buddy_status(ic, name, OPT_LOGGED_IN, NULL, NULL);
@@ -260 +284 @@
 
         /* Create the room now that we "logged in". */
-        if (!td->home_timeline_gc && g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
+        if (!td->timeline_gc && g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
                 twitter_groupchat_init(ic);
 
@@ -436 +460 @@
 {
         struct xt_node *child, *rt = NULL;
-        gboolean truncated = FALSE;
 
         // Walk over the nodes children.
@@ -442 +465 @@
                 if (g_strcasecmp("text", child->name) == 0) {
                         txs->text = g_memdup(child->text, child->text_len + 1);
-                } else if (g_strcasecmp("truncated", child->name) == 0 && child->text) {
-                        truncated = bool2int(child->text);
                 } else if (g_strcasecmp("retweeted_status", child->name) == 0) {
                         rt = child;
@@ -464 +485 @@
         }
 
-        /* If it's a truncated retweet, get the original because dots suck. */
-        if (truncated && rt) {
+        /* If it's a (truncated) retweet, get the original. Even if the API claims it
+           wasn't truncated because it may be lying. */
+        if (rt) {
                 struct twitter_xml_status *rtxs = g_new0(struct twitter_xml_status, 1);
                 if (twitter_xt_get_status(rt, rtxs) != XT_HANDLED) {
@@ -475 +497 @@
                 txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                 txs_free(rtxs);
+        } else {
+                struct xt_node *urls, *url;
+                
+                urls = xt_find_path(node, "entities/urls");
+                for (url = urls ? urls->children : NULL; url; url = url->next) {
+                        /* "short" is a reserved word. :-P */
+                        struct xt_node *kort = xt_find_node(url->children, "url");
+                        struct xt_node *disp = xt_find_node(url->children, "display_url");
+                        char *pos, *new;
+                        
+                        if (!kort || !kort->text || !disp || !disp->text ||
+                            !(pos = strstr(txs->text, kort->text)))
+                                continue;
+                        
+                        *pos = '\0';
+                        new = g_strdup_printf("%s%s &lt;%s&gt;%s", txs->text, kort->text,
+                                              disp->text, pos + strlen(kort->text));
+                        
+                        g_free(txs->text);
+                        txs->text = new;
+                }
         }
 
@@ -520 +563 @@
 
         return XT_HANDLED;
-}
-
-static void twitter_http_get_home_timeline(struct http_request *req);
-
-/**
- * Get the timeline.
- */
-void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
-{
-        struct twitter_data *td = ic->proto_data;
-
-        char *args[4];
-        args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
-        if (td->home_timeline_id) {
-                args[2] = "since_id";
-                args[3] = g_strdup_printf("%llu", (long long unsigned int) td->home_timeline_id);
-        }
-
-        twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                     td->home_timeline_id ? 4 : 2);
-
-        g_free(args[1]);
-        if (td->home_timeline_id) {
-                g_free(args[3]);
-        }
 }
 
@@ -586 +603 @@
         GSList *l;
 
-        td->home_timeline_gc = gc = imcb_chat_new(ic, "home/timeline");
+        td->timeline_gc = gc = imcb_chat_new(ic, "twitter/timeline");
 
         name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
@@ -595 +612 @@
                 bee_user_t *bu = l->data;
                 if (bu->ic == ic)
-                        imcb_chat_add_buddy(td->home_timeline_gc, bu->handle);
+                        imcb_chat_add_buddy(td->timeline_gc, bu->handle);
         }
 }
@@ -608 +625 @@
         struct twitter_xml_status *status;
         struct groupchat *gc;
+        guint64 last_id = 0;
 
         // Create a new groupchat if it does not exsist.
-        if (!td->home_timeline_gc)
+        if (!td->timeline_gc)
                 twitter_groupchat_init(ic);
 
-        gc = td->home_timeline_gc;
+        gc = td->timeline_gc;
         if (!gc->joined)
                 imcb_chat_add_buddy(gc, ic->acc->user);
@@ -621 +639 @@
 
                 status = l->data;
-                if (status->user == NULL || status->text == NULL)
+                if (status->user == NULL || status->text == NULL || last_id == status->id)
                         continue;
 
-                twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+                last_id = status->id;
 
                 strip_html(status->text);
+
                 msg = twitter_msg_add_id(ic, status, "");
 
                 // Say it!
-                if (g_strcasecmp(td->user, status->user->screen_name) == 0)
+                if (g_strcasecmp(td->user, status->user->screen_name) == 0) {
                         imcb_chat_log(gc, "You: %s", msg ? msg : status->text);
-                else
+                } else {
+                        twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+
                         imcb_chat_msg(gc, status->user->screen_name,
                                       msg ? msg : status->text, 0, status->created_at);
+                }
 
                 g_free(msg);
 
-                // Update the home_timeline_id to hold the highest id, so that by the next request
+                // Update the timeline_id to hold the highest id, so that by the next request
                 // we won't pick up the updates already in the list.
-                td->home_timeline_id = MAX(td->home_timeline_id, status->id);
+                td->timeline_id = MAX(td->timeline_id, status->id);
         }
 }
@@ -654 +676 @@
         char from[MAX_STRING];
         gboolean mode_one;
+        guint64 last_id = 0;
 
         mode_one = g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "one") == 0;
@@ -666 +689 @@
 
                 status = l->data;
+                if (status->user == NULL || status->text == NULL || last_id == status->id)
+                        continue;
+
+                last_id = status->id;
 
                 strip_html(status->text);
@@ -680 +707 @@
                                text ? text : status->text, 0, status->created_at);
 
-                // Update the home_timeline_id to hold the highest id, so that by the next request
+                // Update the timeline_id to hold the highest id, so that by the next request
                 // we won't pick up the updates already in the list.
-                td->home_timeline_id = MAX(td->home_timeline_id, status->id);
+                td->timeline_id = MAX(td->timeline_id, status->id);
 
                 g_free(text);
                 g_free(prefix);
+        }
+}
+
+static void twitter_http_get_home_timeline(struct http_request *req);
+static void twitter_http_get_mentions(struct http_request *req);
+
+/**
+ * Get the timeline with optionally mentions
+ */
+void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+        gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
+
+        if (td->flags & TWITTER_DOING_TIMELINE) {
+                return;
+        }
+
+        td->flags |= TWITTER_DOING_TIMELINE;
+
+        twitter_get_home_timeline(ic, next_cursor);
+
+        if (include_mentions) {
+                twitter_get_mentions(ic, next_cursor);
+        }
+}
+
+/**
+ * Call this one after receiving timeline/mentions. Show to user once we have
+ * both.
+ */
+void twitter_flush_timeline(struct im_connection *ic)
+{
+        struct twitter_data *td = ic->proto_data;
+        gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
+        gboolean show_old_mentions = set_getbool(&ic->acc->set, "show_old_mentions");
+        struct twitter_xml_list *home_timeline = td->home_timeline_obj;
+        struct twitter_xml_list *mentions = td->mentions_obj;
+        GSList *output = NULL;
+        GSList *l;
+
+        if (!(td->flags & TWITTER_GOT_TIMELINE)) {
+                return;
+        }
+
+        if (include_mentions && !(td->flags & TWITTER_GOT_MENTIONS)) {
+                return;
+        }
+
+        if (home_timeline && home_timeline->list) {
+                for (l = home_timeline->list; l; l = g_slist_next(l)) {
+                        output = g_slist_insert_sorted(output, l->data, twitter_compare_elements);
+                }
+        }
+
+        if (include_mentions && mentions && mentions->list) {
+                for (l = mentions->list; l; l = g_slist_next(l)) {
+                        if (!show_old_mentions && output && twitter_compare_elements(l->data, output->data) < 0) {
+                                continue;
+                        }
+
+                        output = g_slist_insert_sorted(output, l->data, twitter_compare_elements);
+                }
+        }
+
+        // See if the user wants to see the messages in a groupchat window or as private messages.
+        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
+                twitter_groupchat(ic, output);
+        else
+                twitter_private_message_chat(ic, output);
+
+        g_slist_free(output);
+
+        if (home_timeline && home_timeline->list) {
+                txl_free(home_timeline);
+        }
+
+        if (mentions && mentions->list) {
+                txl_free(mentions);
+        }
+
+        td->flags &= ~(TWITTER_DOING_TIMELINE | TWITTER_GOT_TIMELINE | TWITTER_GOT_MENTIONS);
+}
+
+/**
+ * Get the timeline.
+ */
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+
+        td->home_timeline_obj = NULL;
+        td->flags &= ~TWITTER_GOT_TIMELINE;
+
+        char *args[6];
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
+        if (td->timeline_id) {
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+        }
+
+        if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_HOME_TIMELINE_URL, "connection failed");
+                td->flags |= TWITTER_GOT_TIMELINE;
+                twitter_flush_timeline(ic);
+        }
+
+        g_free(args[1]);
+        if (td->timeline_id) {
+                g_free(args[5]);
+        }
+}
+
+/**
+ * Get mentions.
+ */
+void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+
+        td->mentions_obj = NULL;
+        td->flags &= ~TWITTER_GOT_MENTIONS;
+
+        char *args[6];
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
+        if (td->timeline_id) {
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+        }
+
+        if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, "connection failed");
+                td->flags |= TWITTER_GOT_MENTIONS;
+                twitter_flush_timeline(ic);
+        }
+
+        g_free(args[1]);
+        if (td->timeline_id) {
+                g_free(args[5]);
         }
 }
@@ -713 +891 @@
                 imcb_error(ic, "Authentication failure");
                 imc_logout(ic, FALSE);
-                return;
+                goto end;
         } else {
                 // It didn't go well, output the error and return.
@@ -720 +898 @@
                                    TWITTER_HOME_TIMELINE_URL, twitter_parse_error(req));
 
-                return;
+                goto end;
         }
 
@@ -733 +911 @@
         xt_free(parser);
 
-        // See if the user wants to see the messages in a groupchat window or as private messages.
-        if (txl->list == NULL);
-        else if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
-                twitter_groupchat(ic, txl->list);
-        else
-                twitter_private_message_chat(ic, txl->list);
-
-        // Free the structure.  
-        txl_free(txl);
+        td->home_timeline_obj = txl;
+
+      end:
+        td->flags |= TWITTER_GOT_TIMELINE;
+
+        twitter_flush_timeline(ic);
+}
+
+/**
+ * Callback for getting mentions.
+ */
+static void twitter_http_get_mentions(struct http_request *req)
+{
+        struct im_connection *ic = req->data;
+        struct twitter_data *td;
+        struct xt_parser *parser;
+        struct twitter_xml_list *txl;
+
+        // Check if the connection is still active.
+        if (!g_slist_find(twitter_connections, ic))
+                return;
+
+        td = ic->proto_data;
+
+        // Check if the HTTP request went well.
+        if (req->status_code == 200) {
+                td->http_fails = 0;
+                if (!(ic->flags & OPT_LOGGED_IN))
+                        imcb_connected(ic);
+        } else if (req->status_code == 401) {
+                imcb_error(ic, "Authentication failure");
+                imc_logout(ic, FALSE);
+                goto end;
+        } else {
+                // It didn't go well, output the error and return.
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, twitter_parse_error(req));
+
+                goto end;
+        }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
+        // Parse the data.
+        parser = xt_new(NULL, txl);
+        xt_feed(parser, req->reply_body, req->body_size);
+        // The root <statuses> node should hold the list of statuses <status>
+        twitter_xt_get_status_list(ic, parser->root, txl);
+        xt_free(parser);
+
+        td->mentions_obj = txl;
+
+      end:
+        td->flags |= TWITTER_GOT_MENTIONS;
+
+        twitter_flush_timeline(ic);
 }
 

protocols/twitter/twitter_lib.h

@@ -76 +76 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
+void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);
 

protocols/yahoo/libyahoo2.c

@@ -1809 +1809 @@
         struct yahoo_input_data *yid = had->yid;
         struct yahoo_data *yd = yid->yd;
-        struct http_request *req;
         char *login, *passwd, *chal;
         char *url;
@@ -1823 +1822 @@
                                (int) time(NULL), login, passwd, chal);
         
-        req = http_dorequest_url(url, yahoo_https_auth_token_finish, had);
+        http_dorequest_url(url, yahoo_https_auth_token_finish, had);
         
         g_free(url);
@@ -1870 +1869 @@
 static void yahoo_https_auth_init(struct yahoo_https_auth_data *had)
 {
-        struct http_request *req;
         char *url;
         
@@ -1876 +1874 @@
                               (int) time(NULL), had->token);
         
-        req = http_dorequest_url(url, yahoo_https_auth_finish, had);
+        http_dorequest_url(url, yahoo_https_auth_finish, had);
         
         g_free(url);
@@ -1990 +1988 @@
 {
         struct yahoo_data *yd = yid->yd;
-        char *login_id;
-        char *handle;
         char *url = NULL;
         int login_status = -1;
@@ -2000 +1996 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 0)
-                        login_id = pair->value;
+                        ; /* login_id */
                 else if (pair->key == 1)
-                        handle = pair->value;
+                        ; /* handle */
                 else if (pair->key == 20)
                         url = pair->value;
@@ -2089 +2085 @@
         char *msg = NULL;
         char *name = NULL;
-        long tm = 0L;
         int state = YAHOO_STATUS_AVAILABLE;
-        int online = 0;
         int away = 0;
         int idle = 0;
@@ -2111 +2105 @@
                         state = strtol(pair->value, NULL, 10);
                 else if (pair->key == 15)
-                        tm = strtol(pair->value, NULL, 10);
+                        ; /* tm */
                 else if (pair->key == 13)
-                        online = strtol(pair->value, NULL, 10);
+                        ; /* online */
                 else if (pair->key == 47)
                         away = strtol(pair->value, NULL, 10);
@@ -2140 +2134 @@
         char *where = NULL;
         int status = 0;
-        char *me = NULL;
 
         struct yahoo_buddy *bud = NULL;
@@ -2148 +2141 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 if (pair->key == 7)
                         who = pair->value;
@@ -2204 +2197 @@
         char *who = NULL;
         char *where = NULL;
-        int unk_66 = 0;
-        char *me = NULL;
         struct yahoo_buddy *bud;
 
@@ -2214 +2205 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 else if (pair->key == 7)
                         who = pair->value;
@@ -2220 +2211 @@
                         where = pair->value;
                 else if (pair->key == 66)
-                        unk_66 = strtol(pair->value, NULL, 10);
+                        ; /* unk_66 */
                 else
                         DEBUG_MSG(("unknown key: %d = %s", pair->key,
@@ -2256 +2247 @@
         struct yahoo_packet *pkt)
 {
-        char *who = NULL;
-        int status = 0;
-        char *me = NULL;
-        int un_ignore = 0;
-
         YList *l;
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 0)
-                        who = pair->value;
+                        ; /* who */
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 if (pair->key == 13)    /* 1 == ignore, 2 == unignore */
-                        un_ignore = strtol(pair->value, NULL, 10);
+                        ;
                 if (pair->key == 66)
-                        status = strtol(pair->value, NULL, 10);
+                        ; /* status */
         }
 
@@ -2293 +2279 @@
         char *me = NULL;
         char *room = NULL;
-        char *voice_room = NULL;
 
         YList *l;
@@ -2303 +2288 @@
                         me = pair->value;
                 if (pair->key == 13)
-                        voice_room = pair->value;
+                        ; /* voice room */
                 if (pair->key == 57)
                         room = pair->value;
@@ -2438 +2423 @@
         struct yahoo_packet *pkt)
 {
-        char *me = NULL;
         char *key = NULL;
         char *who = NULL;
@@ -2447 +2431 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 5)
-                        me = pair->value;
+                        ; /* me */
                 if (pair->key == 61)
                         key = pair->value;
@@ -3369 +3353 @@
         struct yahoo_webcam *wcm = y->wcm;
         struct yahoo_input_data *yid;
-        struct yahoo_server_settings *yss;
 
         if (!wcm || !wcm->server || !wcm->key)
@@ -3381 +3364 @@
         yid->wcm = y->wcm;
         y->wcm = NULL;
-
-        yss = y->yd->server_settings;
 
         yid->wcd = y_new0(struct yahoo_webcam_data, 1);
@@ -4975 +4956 @@
         YList *l;
         struct send_file_data *sfd;
-        char *who = NULL;
-        char *filename = NULL;
         char *id = NULL;
         char *token = NULL;
@@ -4984 +4963 @@
                 switch (pair->key) {
                 case 4:
-                        who = pair->value;
+                        /* who */
                         break;
                 case 5:
@@ -4998 +4977 @@
                         break;
                 case 27:
-                        filename = pair->value;
+                        /* filename */
                         break;
                 }
@@ -5023 +5002 @@
 {
         YList *l;
-        char *who = NULL;
-        char *filename = NULL;
         char *id = NULL;
         char *token = NULL;
@@ -5036 +5013 @@
                 case 1:
                 case 4:
-                        who = pair->value;
+                        /* who */
                         break;
                 case 5:
@@ -5053 +5030 @@
                         break;
                 case 27:
-                        filename = pair->value;
+                        /* filename */
                         break;
                 }