Changeset fd03770


Ignore:
Timestamp:
2006-06-25T19:43:14Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c9f0c79
Parents:
6ee9d2d (diff), 9b63df6 (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 from devel/Jelmer.

Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r6ee9d2d rfd03770  
    1212bitlbee.pc
    1313.gdb_history
     14tests/check
  • Makefile

    r6ee9d2d rfd03770  
    4646        rm -f Makefile.settings config.h
    4747        find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
     48
     49check:
     50        $(MAKE) -C tests
    4851
    4952install-doc:
  • configure

    r6ee9d2d rfd03770  
    207207echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
    208208
     209if [ "$events" = "libevent" ]; then
     210        if ! [ -e "${libevent}include/event.h" ]; then
     211                echo
     212                echo 'Warning: Could not find event.h, you might have to install it and/or specify'
     213                echo 'its location using the --libevent= argument. (Example: If event.h is in'
     214                echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
     215        fi
     216       
     217        echo '#define EVENTS_LIBEVENT' >> config.h
     218        cat <<EOF>>Makefile.settings
     219EFLAGS+=-levent -L${libevent}lib
     220CFLAGS+=-I${libevent}include
     221EOF
     222elif [ "$events" = "glib" ]; then
     223        ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
     224        echo '#define EVENTS_GLIB' >> config.h
     225else
     226        echo
     227        echo 'ERROR: Unknown event handler specified.'
     228        exit 1
     229fi
     230echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
     231
    209232detect_gnutls()
    210233{
  • lib/proxy.c

    r6ee9d2d rfd03770  
    539539        phb->data = data;
    540540       
    541 #ifndef _WIN32
    542         sethostent(1);
    543 #endif
    544        
    545541        if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1))
    546542                return proxy_connect_none(host, port, phb);
  • nick.c

    r6ee9d2d rfd03770  
    163163        int i, j;
    164164       
    165         for( i = j = 0; nick[i] && i < MAX_NICK_LENGTH; i++ )
     165        for( i = j = 0; nick[i] && j < MAX_NICK_LENGTH; i++ )
    166166        {
    167167                if( strchr( nick_lc_chars, nick[i] ) ||
     
    172172                }
    173173        }
    174         while( j < MAX_NICK_LENGTH )
     174        while( j <= MAX_NICK_LENGTH )
    175175                nick[j++] = '\0';
    176176}
  • protocols/msn/msn.c

    r6ee9d2d rfd03770  
    9494                        g_slist_free( md->msgq );
    9595                }
     96               
     97                g_free( md->grouplist );
    9698               
    9799                g_free( md );
  • protocols/nogaim.c

    r6ee9d2d rfd03770  
    294294       
    295295        serv_got_crap( gc, "Signing off.." );
     296       
     297        b_event_remove( gc->keepalive );
    296298        gc->flags |= OPT_LOGGING_OUT;
    297299       
    298         b_event_remove( gc->keepalive );
    299300        gc->keepalive = 0;
    300301        gc->prpl->close( gc );
  • user.c

    r6ee9d2d rfd03770  
    106106                        if( u->nick != u->host ) g_free( u->host );
    107107                        if( u->nick != u->realname ) g_free( u->realname );
    108                         if( u->away ) g_free( u->away );
    109                         if( u->handle ) g_free( u->handle );
    110                         if( u->sendbuf ) g_free( u->sendbuf );
     108                        g_free( u->group );
     109                        g_free( u->away );
     110                        g_free( u->handle );
     111                        g_free( u->sendbuf );
    111112                        if( u->sendbuf_timer ) b_event_remove( u->sendbuf_timer );
    112113                        g_free( u );
Note: See TracChangeset for help on using the changeset viewer.