Changeset 8661caa for irc.c


Ignore:
Timestamp:
2008-08-04T14:45:24Z (11 years ago)
Author:
ulim <a.sporto+bee@…>
Branches:
master
Children:
87f525e
Parents:
4ac647d (diff), 718e05f (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:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    r4ac647d r8661caa  
    2626#define BITLBEE_CORE
    2727#include "bitlbee.h"
     28#include "sock.h"
    2829#include "crypting.h"
    2930#include "ipc.h"
     
    315316        g_free( irc );
    316317       
    317         if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
     318        if( global.conf->runmode == RUNMODE_INETD ||
     319            global.conf->runmode == RUNMODE_FORKDAEMON ||
     320            ( global.conf->runmode == RUNMODE_DAEMON &&
     321              global.listen_socket == -1 &&
     322              irc_connection_list == NULL ) )
    318323                b_main_quit();
    319324}
Note: See TracChangeset for help on using the changeset viewer.