Changes in / [b135438:f56c491]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (2 diffs)
• doc/BUILD.win32 (added)
• unix.c (modified) (2 diffs)
• win32.c (added)
• win32/admin/MainDlg.cpp (added)
• win32/admin/MainDlg.h (added)
• win32/admin/PropAccess.cpp (added)
• win32/admin/PropAccess.h (added)
• win32/admin/PropConn.cpp (added)
• win32/admin/PropConn.h (added)
• win32/admin/PropLog.cpp (added)
• win32/admin/PropLog.h (added)
• win32/admin/PropMain.cpp (added)
• win32/admin/PropMain.h (added)
• win32/admin/PropPaths.cpp (added)
• win32/admin/PropPaths.h (added)
• win32/admin/admin.dsp (added)
• win32/admin/bitlbee.rc (added)
• win32/admin/bitlbeewin.cpp (added)
• win32/admin/bitlbeewin.h (added)
• win32/admin/res/bmp00002.bmp (added)
• win32/admin/res/icon2.ico (added)
• win32/admin/resource.h (added)
• win32/bitlbee.dsp (added)
• win32/bitlbee.dsw (added)
• win32/bitlbee.iss (added)
• win32/bitlbee_ssl.dsp (added)
• win32/jabber.dsp (added)
• win32/msn.dsp (added)
• win32/oscar.dsp (added)
• win32/yahoo.dsp (added)

.bzrignore

@@ -2 +2 @@
 config.h
 bitlbee
+Debug
+Debugx
+deps
+admin/Debug
+admin/admin.plg
+bitlbee.plg
+*.plg
+*.aps
+*.clw
 debian

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
+objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o nick.o query.o set.o url.o user.o log.o
 subdirs = protocols
+
+ifeq ($(ARCH),Windows)
+objects += win32.o
+else
+objects += unix.o conf.o
+endif
 
 # Expansion of variables

bitlbee.c

@@ -55 +55 @@
         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 )
@@ -110 +107 @@
         if( !irc_new( 0 ) )
                 return( 1 );
-        
-        log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
-        log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
         
         return( 0 );

unix.c

@@ -60 +60 @@
         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 );
@@ -66 +69 @@
         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 );