Changeset 51a799e

Timestamp:

2010-05-25T22:07:06Z (14 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:

• Makefile (modified) (1 diff)
• configure (modified) (1 diff)
• crypting.c (deleted)
• crypting.h (deleted)
• irc.c (modified) (1 diff)
• protocols/jabber/si.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• storage.c (modified) (2 diffs)
• storage_text.c (deleted)
• win32.c (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-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
-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
+objects = 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
+headers = 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
 subdirs = lib protocols
 

configure

@@ -401 +401 @@
 fi
 
-STORAGES="text xml"
+STORAGES="xml"
 
 if [ "$ldap" = "auto" ]; then

irc.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "sock.h"
-#include "crypting.h"
 #include "ipc.h"
 #include "dcc.h"

protocols/jabber/si.c

@@ -276 +276 @@
                         if( ( bud = jabber_buddy_by_jid( ic, ini_jid, GET_BUDDY_EXACT ) ) )
                         {
-                                bud->last_act = time( NULL );
+                                bud->last_msg = time( NULL );
                                 ext_jid = bud->ext_jid ? : bud->bare_jid;
                         }

root_commands.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "commands.h"
-#include "crypting.h"
 #include "bitlbee.h"
 #include "help.h"

storage.c

@@ -28 +28 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
-#include "crypting.h"
 
 extern storage_t storage_text;
@@ -66 +65 @@
         storage_t *storage;
         
-        register_storage_backend(&storage_text);
         register_storage_backend(&storage_xml);
         

win32.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "commands.h"
-#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"