Changeset 85e9644 for protocols


Ignore:
Timestamp:
2006-06-07T13:36:19Z (18 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c121f89
Parents:
a312b6b (diff), 0025b51 (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:

Merging Jelmer's storage tree (with LDAP support).

Location:
protocols
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • protocols/nogaim.c

    ra312b6b r85e9644  
    294294       
    295295        serv_got_crap( gc, "Signing off.." );
    296 
     296        gc->flags |= OPT_LOGGING_OUT;
     297       
    297298        b_event_remove( gc->keepalive );
    298299        gc->keepalive = 0;

  • protocols/nogaim.h

    ra312b6b r85e9644  
    5454#define WEBSITE "http://www.bitlbee.org/"
    5555#define IM_FLAG_AWAY 0x0020
    56 #define OPT_CONN_HTML 0x00000001
    57 #define OPT_LOGGED_IN 0x00010000
    5856#define GAIM_AWAY_CUSTOM "Custom"
     57
     58#define OPT_CONN_HTML   0x00000001
     59#define OPT_LOGGED_IN   0x00010000
     60#define OPT_LOGGING_OUT 0x00020000
    5961
    6062/* ok. now the fun begins. first we create a connection structure */
Note: See TracChangeset for help on using the changeset viewer.