Changeset 51a799e


Ignore:
Timestamp:
2010-05-25T22:07:06Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
f60079b
Parents:
d25ebea (diff), ba7d16f (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 killerbee. (The non-libpurple stuff currently doesn't compile.)

Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rd25ebea r51a799e  
    1010
    1111# Program variables
    12 objects = account.o bitlbee.o chat.o crypting.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
    13 headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
     12objects = account.o bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
     13headers = account.h bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
    1414subdirs = lib protocols
    1515
  • configure

    rd25ebea r51a799e  
    401401fi
    402402
    403 STORAGES="text xml"
     403STORAGES="xml"
    404404
    405405if [ "$ldap" = "auto" ]; then
  • irc.c

    rd25ebea r51a799e  
    2727#include "bitlbee.h"
    2828#include "sock.h"
    29 #include "crypting.h"
    3029#include "ipc.h"
    3130#include "dcc.h"
  • protocols/jabber/si.c

    rd25ebea r51a799e  
    276276                        if( ( bud = jabber_buddy_by_jid( ic, ini_jid, GET_BUDDY_EXACT ) ) )
    277277                        {
    278                                 bud->last_act = time( NULL );
     278                                bud->last_msg = time( NULL );
    279279                                ext_jid = bud->ext_jid ? : bud->bare_jid;
    280280                        }
  • root_commands.c

    rd25ebea r51a799e  
    2626#define BITLBEE_CORE
    2727#include "commands.h"
    28 #include "crypting.h"
    2928#include "bitlbee.h"
    3029#include "help.h"
  • storage.c

    rd25ebea r51a799e  
    2828#define BITLBEE_CORE
    2929#include "bitlbee.h"
    30 #include "crypting.h"
    3130
    3231extern storage_t storage_text;
     
    6665        storage_t *storage;
    6766       
    68         register_storage_backend(&storage_text);
    6967        register_storage_backend(&storage_xml);
    7068       
  • win32.c

    rd25ebea r51a799e  
    2727#include "bitlbee.h"
    2828#include "commands.h"
    29 #include "crypting.h"
    3029#include "protocols/nogaim.h"
    3130#include "help.h"
Note: See TracChangeset for help on using the changeset viewer.