Changeset e8a6211


Ignore:
Timestamp:
2006-10-22T17:00:15Z (18 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
f0071b7
Parents:
66f783f (diff), 6237ded (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:

Merge from main tree.

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • configure

    r66f783f re8a6211  
    3131
    3232events=glib
    33 ldap=auto
     33ldap=0
    3434ssl=auto
    3535
    3636arch=`uname -s`
    3737cpu=`uname -m`
     38
     39GLIB_MIN_VERSION=2.4
    3840
    3941echo BitlBee configure
    … …  
    175177
    176178if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
    177         cat<<EOF>>Makefile.settings
     179        if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
     180                cat<<EOF>>Makefile.settings
    178181EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
    179182CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
    180183EOF
    181 else
     184        else
     185                echo
     186                echo 'Found glib2 '`$PKG_CONFIG glib-2.0 --modversion`', but version '$GLIB_MIN_VERSION' or newer is required.'
     187                exit 1
     188        fi
     189else
     190        echo
    182191        echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
    183         exit 1;
     192        exit 1
    184193fi
    185194
    … …  
    290299elif [ "$ssl" = "bogus" ]; then
    291300        echo
    292         echo 'Using bogus SSL code. This means some features have to be disabled.'
     301        echo 'Using bogus SSL code. This means some features will not work properly.'
    293302       
    294303        ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?

  • doc/CHANGES

    r66f783f re8a6211  
    11Version x.x:
     2- Added ForkDaemon mode next to the existing Daemon- and inetd modes. With
     3  ForkDaemon you can run BitlBee as a stand-alone daemon and every connection
     4  will run in its own process. No more need to configure inetd, and still you
     5  don't get the stability problems BitlBee unfortunately still has in ordinary
     6  (one-process) daemon mode.
     7- Added inter-process/connection communication. This made it possible to
     8  implement some IRC operator features like WALLOPs, KILL, DIE, REHASH and
     9  more.
     10- Added hooks for using libevent instead of GLib for event handling. This
     11  should improve scalability, although this won't really be useful yet because
     12  the one-process daemon mode is not reliable enough.
     13- BitlBee now makes the buddy quits when doing "account off" look like a
     14  netsplit. Modern IRC clients show this in a different, more compact way.
     15- GLib 1.x compatibility was dropped. BitlBee now requires GLib 2.4 or newer.
     16  This allows us to use more GLib features (like the XML parser). By now GLib
     17  1.x is so old that supporting it really isn't necessary anymore.
     18- Many, many, MANY little changes, improvements, fixes. Using non-blocking
     19  I/O as much as possible, fixed lots of little bugs (including bugs that
     20  affected daemon mode stability). See the bzr logs for more information.
    221- Most important change: New file format for user data (accounts, nicks and
    322  settings). Migration to the new format should happen transparently,
    … …  
    2241    and password for the existing connection.
    2342  * Per-account settings (see the new "account set" command).
     43
     44Version 1.0.3:
     45- Fixed ugliness in block/allow list commands (still not perfect though, the
     46  list is empty or not up-to-date for most protocols).
     47- OSCAR module doesn't send the ICQ web-aware flag anymore, which seems to
     48  get rid of a lot of ICQ spam.
     49- added show_got_added(), BitlBee asks you, after authorizing someone, if you
     50  want to add him/her to your list too.
     51- add -tmp, mainly convenient if you want to talk to people who are not in
     52  your list.
     53- Fixed ISON command, should work better with irssi now.
     54- Fixed compilation with tcc.
     55- Fixed xinetd-file.
     56- Misc. (crash)bug fixes, including one in the root command parsing that
     57  caused mysterious error messages sometimes.
     58
     59Finished 24 Jun 2006 (Happy 4th birthday, BitlBee!)
     60
     61Version 1.0.2:
     62- Pieces of code cleanup, fixes for possible problems in error checking.
     63- Fixed an auto-reconnect cleanup problem that caused crashes in daemon mode.
     64- /AWAY in daemon mode now doesn't set the away state for every connection
     65  anymore.
     66- Fixed a crash-bug on empty help subjects.
     67- Jabber now correctly sets the current away state when connecting.
     68- Added Invisible and Hidden to the away state alias list, invisible mode
     69  should be pretty usable now.
     70- Fixed handling of iconv(): It's now done for everything that goes between
     71  BitlBee and the IRC client, instead of doing it (almost) every time
     72  something goes to or come from the IM-modules. Should've thought about
     73  that before. :-)
     74- When cleaning up MSN switchboards with unsent msgs, it now also says which
     75  contact those messages were meant for.
     76- You can now use the block and allow commands to see your current block/
     77  allow list.
     78
     79Finished 1 Apr 2006
     80
     81Version 1.0.1:
     82- Support for AIM groupchats.
     83- Improved typing notification support for at least AIM.
     84- BitlBee sends a 005 reply when logging in, this informs modern IRC clients
     85  of some of BitlBee's capabilities. This might also solve problems some
     86  people were having with the new control channel name.
     87- MSN switchboards are now properly reset when talking to a person who is
     88  offline. This fixes problems with messages to MSN people that sometimes
     89  didn't arrive.
     90- Fixed one of the problems that made BitlBee show online Jabber people as
     91  offline.
     92- Fixed problems with commas in MSN passwords.
     93- Added some consts for read-only data, which should make the BitlBee per-
     94  process memory footprint a bit smaller.
     95- Other bits of code cleanup.
     96
     97Finished 14 Jan 2006
    2498
    2599Version 1.0:

  • protocols/msn/msn.c

    r66f783f re8a6211  
    4242        struct msn_data *md = g_new0( struct msn_data, 1 );
    4343       
    44         set_login_progress( gc, 1, "Connecting" );
    45        
    4644        gc->proto_data = md;
    4745        md->fd = -1;
    … …  
    5452        }
    5553       
     54        set_login_progress( gc, 1, "Connecting" );
     55       
    5656        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc );
    5757        if( md->fd < 0 )
    … …  
    5959                hide_login_progress( gc, "Could not connect to server" );
    6060                signoff( gc );
    61         }
    62         else
    63         {
    64                 md->gc = gc;
    65                 md->away_state = msn_away_state_list;
    66                
    67                 msn_connections = g_slist_append( msn_connections, gc );
    68         }
     61                return;
     62        }
     63       
     64        md->gc = gc;
     65        md->away_state = msn_away_state_list;
     66       
     67        msn_connections = g_slist_append( msn_connections, gc );
    6968}
    7069

  • protocols/nogaim.c

    r66f783f re8a6211  
    578578              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
    579579        {
    580                 irc_write( gc->irc, ":%s!%s@%s MODE %s %cv %s", gc->irc->mynick, gc->irc->mynick, gc->irc->myhost,
     580                irc_write( gc->irc, ":%s MODE %s %cv %s", gc->irc->myhost,
    581581                                                                gc->irc->channel, u->away?'-':'+', u->nick );
    582582        }
    … …  
    912912                                {
    913913                                        for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
    914                                         irc_write( irc, ":%s!%s@%s MODE %s %c%s%s",
    915                                                    irc->mynick, irc->mynick, irc->myhost,
     914                                        irc_write( irc, ":%s MODE %s %c%s%s",
     915                                                   irc->myhost,
    916916                                                   irc->channel, pm, v, list );
    917917                                       
    … …  
    928928                /* $v = 'v' x $i */
    929929                for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
    930                 irc_write( irc, ":%s!%s@%s MODE %s %c%s%s", irc->mynick, irc->mynick, irc->myhost,
     930                irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost,
    931931                                                            irc->channel, pm, v, list );
    932932        }

  • protocols/oscar/oscar.c

    r66f783f re8a6211  
    22972297        }
    22982298        info_string_append(str, "\n", _("Mobile Phone"), info->mobile);
    2299         info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : _("Male"));
     2299        info_string_append(str, "\n", _("Gender"), info->gender==1 ? _("Female") : info->gender==2 ? _("Male") : _("Unknown"));
    23002300        if (info->birthyear || info->birthmonth || info->birthday) {
    23012301                char date[30];

  • set.c

    r66f783f re8a6211  
    173173char *set_eval_int( set_t *set, char *value )
    174174{
    175         char *s;
     175        char *s = value;
    176176       
    177177        /* Allow a minus at the first position. */
    … …  
    179179                s ++;
    180180       
    181         for( s = value; *s; s ++ )
     181        for( ; *s; s ++ )
    182182                if( !isdigit( *s ) )
    183183                        return NULL;

  • storage_text.c

    r66f783f re8a6211  
    3131{
    3232        if( access( global.conf->configdir, F_OK ) != 0 )
    33                 log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
     33                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir );
    3434        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
    3535                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );

  • storage_xml.c

    r66f783f re8a6211  
    263263{
    264264        if( access( global.conf->configdir, F_OK ) != 0 )
    265                 log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
     265                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", global.conf->configdir );
    266266        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
    267267                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
Note: See TracChangeset for help on using the changeset viewer.