Changeset b006464 for protocols


Ignore:
Timestamp:
2012-11-17T23:51:21Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5aa96fc8
Parents:
d1356cb (diff), e1d3f98 (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:

Merge mainline.

Location:
protocols
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/iq.c

    rd1356cb rb006464  
    128128                                                   XMLNS_MUC,
    129129                                                   XMLNS_PING,
     130                                                   XMLNS_RECEIPTS,
    130131                                                   XMLNS_SI,
    131132                                                   XMLNS_BYTESTREAMS,
  • protocols/jabber/jabber.c

    rd1356cb rb006464  
    231231        if( set_getbool( &acc->set, "ssl" ) )
    232232        {
    233                 jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), FALSE, jabber_connected_ssl, ic );
     233                jd->ssl = ssl_connect( connect_to, set_getint( &acc->set, "port" ), set_getbool( &acc->set, "tls_verify" ), jabber_connected_ssl, ic );
    234234                jd->fd = jd->ssl ? ssl_getfd( jd->ssl ) : -1;
    235235        }
  • protocols/jabber/jabber.h

    rd1356cb rb006464  
    227227#define XMLNS_TIME         "urn:xmpp:time"                                       /* XEP-0202 */
    228228#define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
     229#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
    229230#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
    230231#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
  • protocols/jabber/message.c

    rd1356cb rb006464  
    2929        char *from = xt_find_attr( node, "from" );
    3030        char *type = xt_find_attr( node, "type" );
     31        char *id = xt_find_attr( node, "id" );
    3132        struct xt_node *body = xt_find_node( node->children, "body" ), *c;
     33        struct xt_node *request = xt_find_node( node->children, "request" );
    3234        struct jabber_buddy *bud = NULL;
    3335        char *s, *room = NULL, *reason = NULL;
     
    3537        if( !from )
    3638                return XT_HANDLED; /* Consider this packet corrupted. */
     39
     40        if( request && id )
     41        {
     42                /* Send a message receipt (XEP-0184), looking like this:
     43                 * <message
     44                 *  from='kingrichard@royalty.england.lit/throne'
     45                 *  id='bi29sg183b4v'
     46                 *  to='northumberland@shakespeare.lit/westminster'>
     47                 *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
     48                 * </message> */
     49                struct xt_node *received, *receipt;
     50               
     51                received = xt_new_node( "received", NULL, NULL );
     52                xt_add_attr( received, "xmlns", XMLNS_RECEIPTS );
     53                xt_add_attr( received, "id", id );
     54                receipt = jabber_make_packet( "message", NULL, from, received );
     55
     56                jabber_write_packet( ic, receipt );
     57                xt_free_node( receipt );
     58        }
    3759       
    3860        bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );
  • protocols/nogaim.h

    rd1356cb rb006464  
    9090        int permdeny;
    9191       
    92         char displayname[128];
    9392        char *away;
    94        
    95         int evil;
    9693       
    9794        /* BitlBee */
     
    129126        char show[BUDDY_ALIAS_MAXLEN];
    130127        int present;
    131         int evil;
    132128        time_t signon;
    133129        time_t idle;
  • protocols/oscar/oscar.c

    rd1356cb rb006464  
    946946                        g_hash_table_insert(od->ips, uin, (gpointer) (long) info->icqinfo.ipaddr);
    947947        }
    948 
    949         if (!aim_sncmp(ic->acc->user, info->sn))
    950                 g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
    951948
    952949        tmp = normalize(info->sn);
     
    15361533
    15371534static int gaim_selfinfo(aim_session_t *sess, aim_frame_t *fr, ...) {
    1538         va_list ap;
    1539         aim_userinfo_t *info;
    1540         struct im_connection *ic = sess->aux_data;
    1541 
    1542         va_start(ap, fr);
    1543         info = va_arg(ap, aim_userinfo_t *);
    1544         va_end(ap);
    1545 
    1546         ic->evil = info->warnlevel/10;
    1547         /* ic->correction_time = (info->onlinesince - ic->login_time); */
    1548 
    15491535        return 1;
    15501536}
Note: See TracChangeset for help on using the changeset viewer.