Changes in / [bf02a67:bd69a21]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (2 diffs)
• doc/BUILD.win32 (added)
• protocols/nogaim.h (modified) (2 diffs)
• unix.c (modified) (2 diffs)
• win32.c (added)
• win32.mk (added)
• win32/bitlbee.iss (added)

.bzrignore

@@ -2 +2 @@
 config.h
 bitlbee
+Debug
+Debugx
+deps
+admin/Debug
+admin/admin.plg
+bitlbee.plg
+*.plg
+*.aps
+*.clw
 user-guide.txt
 user-guide.html

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o storage_text.o storage.o
+objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o url.o user.o storage_text.o storage.o
 subdirs = protocols
+
+ifeq ($(ARCH),Windows)
+objects += win32.o
+else
+objects += unix.o conf.o
+endif
 
 # Expansion of variables

bitlbee.c

@@ -54 +54 @@
         GIOChannel *ch;
         
-        log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
-        
         global.listen_socket = socket( AF_INET, SOCK_STREAM, 0 );
         if( global.listen_socket == -1 )
@@ -109 +106 @@
         if( !irc_new( 0 ) )
                 return( 1 );
-        
-        log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
         
         return( 0 );

protocols/nogaim.h

@@ -159 +159 @@
         irc_t *irc;
 };
+
+struct ft 
+{
+        const char *filename;
+        
+        /* Total number of bytes in file */
+        size_t total_bytes;
+        
+        /* Current number of bytes received */
+        size_t cur_bytes;
+};
+
+struct ft_request 
+{
+        const char *filename;
+        struct gaim_connection *gc;
+};
+
+typedef void (*ft_recv_handler) (struct ft *, void *data, size_t len);
 
 struct prpl {
@@ -215 +234 @@
         void (* group_buddy)    (struct gaim_connection *, char *who, char *old_group, char *new_group);
 
+        /* file transfers */
+        struct ft_send_req *(* req_send_file) (struct gaim_connection *, const char *file);
+        void (* send_file_part) (struct gaim_connection *, struct ft*, void *data, size_t length);
+        void (* accept_recv_file) (struct gaim_connection *, struct ft*, ft_recv_handler);
+
         void (* buddy_free)     (struct buddy *);
 

unix.c

@@ -61 +61 @@
         if( global.conf->runmode == RUNMODE_INETD )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+        
                 i = bitlbee_inetd_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
@@ -67 +70 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );