Changeset b135438


Ignore:
Timestamp:
2005-11-15T13:20:27Z (18 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
c998255, f56c491
Parents:
f7f3ada (diff), c1ede6e8 (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 changes from Wilmer

Files:
27 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rf7f3ada rb135438  
    22config.h
    33bitlbee
     4debian
  • Makefile

    rf7f3ada rb135438  
    1010
    1111# Program variables
    12 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 debug.o
     12objects = 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
    1313subdirs = protocols
    1414
  • bitlbee.c

    rf7f3ada rb135438  
    4141                                     &size );
    4242       
    43         count_io_event(source, "main");
    44        
    4543        log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
    4644        irc_new( new_socket );
     
    125123        int st;
    126124       
    127         count_io_event(source, "main");
    128 
    129125        if( condition & G_IO_ERR || condition & G_IO_HUP )
    130126        {
     
    181177        time_t newtime;
    182178#endif
    183 
    184         count_io_event(source, "main");
    185179
    186180#ifdef FLOOD_SEND       
  • bitlbee.h

    rf7f3ada rb135438  
    107107#include "help.h"
    108108#include "query.h"
    109 #include "debug.h"
    110109#include "sock.h"
    111110
  • commands.c

    rf7f3ada rb135438  
    5252        { "import_buddies", 1, cmd_import_buddies },
    5353        { "qlist",          0, cmd_qlist },
    54         { "dump",           0, cmd_dump },
    5554        { NULL }
    5655};
     
    785784        return( 0 );
    786785}
    787 
    788 int cmd_dump( irc_t *irc, char **cmd ) {
    789         write_io_activity();
    790         irc_usermsg(irc, "Wrote GIO activity log to disk.");   
    791        
    792         return( 0 );
    793 }
  • conf.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • doc/CHANGES

    rf7f3ada rb135438  
     1Version 1.0:
     2- Removed some crashy debugging code.
     3- QUIT command now works before logging in. (Mainly an RFC-compliancy fix.)
     4
     5Finished ...
     6
    17Version 0.99:
    28- Fixed memory initialization bug in OSCAR module that caused crashes on
  • doc/Makefile

    rf7f3ada rb135438  
    55        install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
    66        install -m 0644 bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
    7         make -C user-guide $@
     7        $(MAKE) -C user-guide $@
    88
    99uninstall:
    1010        rm -f $(DESTDIR)$(MANDIR)/man8/bitlbee.8*
    1111        rm -f $(DESTDIR)$(MANDIR)/man5/bitlbee.conf.5*
    12         make -C user-guide $@
     12        $(MAKE) -C user-guide $@
    1313
    1414.PHONY: install uninstall
  • doc/bitlbee.8

    rf7f3ada rb135438  
    9898the on-line help system.
    9999.SH BUGS
    100 Of course there are bugs. If you find some, please report them by e-mail
    101 to \fBwilmer@gaast.net\fP, or join \fB#bitlbee\fP on the OFTC network.
    102 (\fBirc.bitlbee.org\fP)
     100Of course there are bugs. If you find some, please report them at
     101\fBhttp://bugs.bitlbee.org/\fP.
    103102.SH LICENSE
    104103This program is free software; you can redistribute it and/or modify
  • doc/user-guide/help.txt

    rf7f3ada rb135438  
    1010You can read more about them with help <subject>
    1111
    12 BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to wilmer@gaast.net. (There is no BitlBee mailing list)
    13 
    14 Or just join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
     12BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at http://bugs.bitlbee.org/.
     13
     14For other things than bug reports, you can join #BitlBee on OFTC (irc.oftc.net) (OFTC, *not* FreeNode!) and flame us right in the face. :-)
    1515%
    1616?index
  • doc/user-guide/help.xml

    rf7f3ada rb135438  
    2424
    2525<para>
    26 BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bug reports and other kinds of feedback can be sent by e-mail to <emphasis>wilmer@gaast.net</emphasis>. (There is no BitlBee mailing list)
     26BitlBee is written by Wilmer van der Gaast together with Jelmer Vernooij, Maurits Dijkstra and others. Bugs can be reported at <ulink link="http://bugs.bitlbee.org/">http://bugs.bitlbee.org/</ulink>.
    2727</para>
    2828
    2929<para>
    30 Or just join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* FreeNode! Some people accidentally joined #BitlBee on FreeNode already, which is just an empty channel) and flame us right in the face. :-)
     30For other things than bug reports, you can join <emphasis>#BitlBee</emphasis> on OFTC (<emphasis>irc.oftc.net</emphasis>) (OFTC, *not* FreeNode!) and flame us right in the face. :-)
    3131</para>
    3232
  • doc/user-guide/user-guide.html

    rf7f3ada rb135438  
    1313         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    1414         USA.
    15        </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#Installation">1. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Usage">2. Usage</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Support">3. Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#quickstart">4. Quickstart</a></span></dt><dd><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="#commands">5. Bitlbee commands</a></span></dt><dd><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></dd><dt><span class="chapter"><a href="#misc">6. Misc Stuff</a></span></dt><dd><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></dd></dl></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Installation"></a>Chapter 1. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683446">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id4683474">Compiling</a></span></dt><dt><span class="sect1"><a href="#id4683726">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683446"></a>Downloading the package</h2></div></div></div><p>
     15       </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#Installation">1. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">Configuration</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Usage">2. Usage</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">Talking to people</a></span></dt></dl></dd><dt><span class="chapter"><a href="#Support">3. Support</a></span></dt><dd><dl><dt><span class="sect1"><a href="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">Mailinglists</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#quickstart">4. Quickstart</a></span></dt><dd><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="#commands">5. Bitlbee commands</a></span></dt><dd><dl><dt><span class="sect1"><a href="#cmd_account">account - IM-account list maintenance</a></span></dt><dd><dl><dt><span class="sect2"><a href="#cmd_account_add">account add</a></span></dt><dt><span class="sect2"><a href="#cmd_account_del">account del</a></span></dt><dt><span class="sect2"><a href="#cmd_account_on">account on</a></span></dt><dt><span class="sect2"><a href="#cmd_account_off">account off</a></span></dt><dt><span class="sect2"><a href="#cmd_account_list">account list</a></span></dt></dl></dd><dt><span class="sect1"><a href="#cmd_add">add - Add a buddy to your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_info">info - Request user information</a></span></dt><dt><span class="sect1"><a href="#cmd_remove">remove - Remove a buddy from your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_block">block - Block someone</a></span></dt><dt><span class="sect1"><a href="#cmd_allow">allow - Unblock someone</a></span></dt><dt><span class="sect1"><a href="#cmd_set">set - Miscellaneous settings</a></span></dt><dt><span class="sect1"><a href="#cmd_help">help - BitlBee help system</a></span></dt><dt><span class="sect1"><a href="#cmd_save">save - Save your account data</a></span></dt><dt><span class="sect1"><a href="#set_charset">charset</a></span></dt><dt><span class="sect1"><a href="#set_private">private</a></span></dt><dt><span class="sect1"><a href="#set_save_on_quit">save_on_quit</a></span></dt><dt><span class="sect1"><a href="#set_html">html</a></span></dt><dt><span class="sect1"><a href="#set_debug">debug</a></span></dt><dt><span class="sect1"><a href="#set_to_char">to_char</a></span></dt><dt><span class="sect1"><a href="#set_typing_notice">typing_notice</a></span></dt><dt><span class="sect1"><a href="#set_ops">ops</a></span></dt><dt><span class="sect1"><a href="#set_away_devoice">away_devoice</a></span></dt><dt><span class="sect1"><a href="#set_handle_unknown">handle_unknown</a></span></dt><dt><span class="sect1"><a href="#set_auto_connect">auto_connect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect">auto_reconnect</a></span></dt><dt><span class="sect1"><a href="#set_auto_reconnect_delay">auto_reconnect_delay</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer">buddy_sendbuffer</a></span></dt><dt><span class="sect1"><a href="#set_buddy_sendbuffer_delay">buddy_sendbuffer_delay</a></span></dt><dt><span class="sect1"><a href="#set_default_target">default_target</a></span></dt><dt><span class="sect1"><a href="#set_display_namechanges">display_namechanges</a></span></dt><dt><span class="sect1"><a href="#set_password">password</a></span></dt><dt><span class="sect1"><a href="#set_query_order">query_order</a></span></dt><dt><span class="sect1"><a href="#set_lcnicks">lcnicks</a></span></dt><dt><span class="sect1"><a href="#cmd_rename">rename - Rename (renick) a buddy</a></span></dt><dt><span class="sect1"><a href="#cmd_yes">yes - Accept a request</a></span></dt><dt><span class="sect1"><a href="#cmd_no">no - Deny a request</a></span></dt><dt><span class="sect1"><a href="#cmd_qlist">qlist - List all the unanswered questions root asked</a></span></dt><dt><span class="sect1"><a href="#cmd_register">register - Register yourself</a></span></dt><dt><span class="sect1"><a href="#cmd_identify">identify - Identify yourself with your password</a></span></dt><dt><span class="sect1"><a href="#cmd_drop">drop - Drop your account</a></span></dt><dt><span class="sect1"><a href="#cmd_blist">blist - List all the buddies in your contact list</a></span></dt><dt><span class="sect1"><a href="#cmd_nick">nick - Change friendly name, nick</a></span></dt><dt><span class="sect1"><a href="#cmd_import_buddies">import_buddies - Copy local buddy list to server (normally only needed when upgrading)</a></span></dt></dl></dd><dt><span class="chapter"><a href="#misc">6. Misc Stuff</a></span></dt><dd><dl><dt><span class="sect1"><a href="#smileys">Smileys</a></span></dt><dt><span class="sect1"><a href="#groupchats">Groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats2">Creating groupchats</a></span></dt><dt><span class="sect1"><a href="#groupchats3">Groupchat channel names</a></span></dt><dt><span class="sect1"><a href="#away">Away states</a></span></dt></dl></dd></dl></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Installation"></a>Chapter 1. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2488359">Downloading the package</a></span></dt><dt><span class="sect1"><a href="#id2449756">Compiling</a></span></dt><dt><span class="sect1"><a href="#id2449897">Configuration</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2488359"></a>Downloading the package</h2></div></div></div><p>
    1616The latest BitlBee release is always available from <a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a>.
    1717Download the package with your favorite program and unpack it: <span><strong class="command">tar
    1818xvfz bitlbee-&lt;version&gt;.tar.gz</strong></span> where &lt;version&gt; is to be
    1919replaced by the version number of the BitlBee you downloaded (e.g. 0.91).
    20 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683474"></a>Compiling</h2></div></div></div><p>
     20</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449756"></a>Compiling</h2></div></div></div><p>
    2121BitlBee's build system has to be configured before compiling. The
    2222<code class="filename">configure</code> script will do this for you. Just run
     
    5050<span><strong class="command">make</strong></span>. After that, run <span><strong class="command">make install</strong></span> as
    5151root.
    52 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683726"></a>Configuration</h2></div></div></div><p>
     52</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2449897"></a>Configuration</h2></div></div></div><p>
    5353By default, BitlBee runs as the user nobody. You might want
    5454to run it as a seperate user (some computers run named or apache as nobody).
     
    7878Because things like passwords are saved in this directory, it's probably
    7979a good idea to make this directory owner-read-/writable only.
    80 </p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Usage"></a>Chapter 2. Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683835">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id4683848">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id4683867">Talking to people</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683835"></a>Connecting to the server</h2></div></div></div><p>
     80</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Usage"></a>Chapter 2. Usage</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2450201">Connecting to the server</a></span></dt><dt><span class="sect1"><a href="#id2450215">The #bitlbee control channel</a></span></dt><dt><span class="sect1"><a href="#id2450234">Talking to people</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450201"></a>Connecting to the server</h2></div></div></div><p>
    8181Since BitlBee acts just like any other irc daemon, you can connect to
    8282it with your favorite irc client. Launch it and connect to localhost port 6667
    8383(or whatever host/port you are running bitlbee on).
    84 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683848"></a>The #bitlbee control channel</h2></div></div></div><p>
     84</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450215"></a>The #bitlbee control channel</h2></div></div></div><p>
    8585Once you are connected to the BitlBee server, you are automatically joined
    8686to #bitlbee on that server. This channel acts like the 'buddy list' you have
     
    8989The user 'root' always hangs around in #bitlbee and acts as your interface
    9090to bitlbee. All commands you give on #bitlbee are 'answered' by root.
    91 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683867"></a>Talking to people</h2></div></div></div><p>
     91</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450234"></a>Talking to people</h2></div></div></div><p>
    9292You can talk to by starting a query with them. In most irc clients,
    9393this can be done with either <span><strong class="command">/msg &lt;nick&gt; &lt;text&gt;</strong></span>
     
    9696To keep the number of open query windows limited, you can also talk to people
    9797in the control channel, like <span><strong class="command">&lt;nick&gt;: &lt;text&gt;</strong></span>.
    98 </p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Support"></a>Chapter 3. Support</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id4683912">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id4683926">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id4683931">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id4683948">IRC</a></span></dt><dt><span class="sect2"><a href="#id4683960">Mailinglists</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683912"></a>BitlBee is beta software</h2></div></div></div><p>
     98</p></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="Support"></a>Chapter 3. Support</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2450279">BitlBee is beta software</a></span></dt><dt><span class="sect1"><a href="#id2450293">Support channels</a></span></dt><dd><dl><dt><span class="sect2"><a href="#id2450298">The World Wide Web</a></span></dt><dt><span class="sect2"><a href="#id2450315">IRC</a></span></dt><dt><span class="sect2"><a href="#id2450326">Mailinglists</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450279"></a>BitlBee is beta software</h2></div></div></div><p>
    9999Although BitlBee has quite some functionality it is still beta. That means it
    100100can crash at any time, corrupt your data or whatever. Don't use it in
    101101any production environment and don't rely on it.
    102 </p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id4683926"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683931"></a>The World Wide Web</h3></div></div></div><p><a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a>
     102</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2450293"></a>Support channels</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450298"></a>The World Wide Web</h3></div></div></div><p><a href="http://www.bitlbee.org/" target="_top">http://www.bitlbee.org/</a>
    103103is the homepage of bitlbee and contains the most recent news on bitlbee and
    104104the latest releases.
    105 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683948"></a>IRC</h3></div></div></div><p>
     105</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450315"></a>IRC</h3></div></div></div><p>
    106106BitlBee is discussed on #bitlbee on the OFTC IRC network (server: irc.oftc.net).
    107 </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id4683960"></a>Mailinglists</h3></div></div></div><p>
     107</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2450326"></a>Mailinglists</h3></div></div></div><p>
    108108BitlBee doesn't have any mailinglists.
    109109</p></div></div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="quickstart"></a>Chapter 4. Quickstart</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#quickstart2">Add and Connect To your IM Account(s)</a></span></dt><dt><span class="sect1"><a href="#quickstart3">Managing Contact Lists: Rename</a></span></dt><dt><span class="sect1"><a href="#quickstart4">Step Four: Managing Contact Lists: Add and Remove.</a></span></dt><dt><span class="sect1"><a href="#quickstart5">Chatting</a></span></dt><dt><span class="sect1"><a href="#quickstart6">Further Resources</a></span></dt></dl></div><p>
  • doc/user-guide/user-guide.txt

    rf7f3ada rb135438  
    108108    Away states
    109109
    110 Chapter 1. Installation
     110Chapter 1. Installation
    111111
    112112Table of Contents
     
    192192idea to make this directory owner-read-/writable only.
    193193
    194 Chapter 2. Usage
     194Chapter 2. Usage
    195195
    196196Table of Contents
     
    223223in the control channel, like <nick>: <text>.
    224224
    225 Chapter 3. Support
     225Chapter 3. Support
    226226
    227227Table of Contents
     
    256256BitlBee doesn't have any mailinglists.
    257257
    258 Chapter 4. Quickstart
     258Chapter 4. Quickstart
    259259
    260260Table of Contents
     
    389389suggestion. Good luck and enjoy the Bee!
    390390
    391 Chapter 5. Bitlbee commands
     391Chapter 5. Bitlbee commands
    392392
    393393Table of Contents
     
    443443account - IM-account list maintenance
    444444
    445 Syntax: 
     445Syntax: 
    446446
    447447account <action> [<arguments>]
     
    452452account add
    453453
    454 Syntax: 
     454Syntax: 
    455455
    456456account add <protocol> <username> <password> [<server>]
     
    463463account add jabber
    464464
    465 Syntax: 
     465Syntax: 
    466466
    467467account add jabber <handle> <password> [<servertag>]
     
    482482account add msn
    483483
    484 Syntax: 
     484Syntax: 
    485485
    486486account add msn <handle> <password>
     
    490490account add oscar
    491491
    492 Syntax: 
     492Syntax: 
    493493
    494494account add oscar <handle> <password> [<servername>]
     
    505505account add yahoo
    506506
    507 Syntax: 
     507Syntax: 
    508508
    509509account add yahoo <handle> <password>
     
    513513account del
    514514
    515 Syntax: 
     515Syntax: 
    516516
    517517account del <account id>
     
    525525account on
    526526
    527 Syntax: 
     527Syntax: 
    528528
    529529account on [<account id>]
     
    538538account off
    539539
    540 Syntax: 
     540Syntax: 
    541541
    542542account off [<account id>]
     
    551551account list
    552552
    553 Syntax: 
     553Syntax: 
    554554
    555555account list
     
    560560add - Add a buddy to your contact list
    561561
    562 Syntax: 
     562Syntax: 
    563563
    564564add <connection> <handle> [<nick>]
     
    577577info - Request user information
    578578
    579 Syntax: 
     579Syntax: 
    580580
    581581info <connection> <handle>
     
    592592remove - Remove a buddy from your contact list
    593593
    594 Syntax: 
     594Syntax: 
    595595
    596596remove <nick>
     
    603603block - Block someone
    604604
    605 Syntax: 
     605Syntax: 
    606606
    607607block <nick>
     
    614614allow - Unblock someone
    615615
    616 Syntax: 
     616Syntax: 
    617617
    618618allow <nick>
     
    624624set - Miscellaneous settings
    625625
    626 Syntax: 
     626Syntax: 
    627627
    628628set [<variable> [<value>]]
     
    638638help - BitlBee help system
    639639
    640 Syntax: 
     640Syntax: 
    641641
    642642help [subject]
     
    647647save - Save your account data
    648648
    649 Syntax: 
     649Syntax: 
    650650
    651651save
     
    848848rename - Rename (renick) a buddy
    849849
    850 Syntax: 
     850Syntax: 
    851851
    852852rename <oldnick> <newnick>
     
    860860yes - Accept a request
    861861
    862 Syntax: 
     862Syntax: 
    863863
    864864yes [<number>]
     
    873873no - Deny a request
    874874
    875 Syntax: 
     875Syntax: 
    876876
    877877no [<number>]
     
    886886qlist - List all the unanswered questions root asked
    887887
    888 Syntax: 
     888Syntax: 
    889889
    890890qlist
     
    894894register - Register yourself
    895895
    896 Syntax: 
     896Syntax: 
    897897
    898898register <password>
     
    911911identify - Identify yourself with your password
    912912
    913 Syntax: 
     913Syntax: 
    914914
    915915identify <password>
     
    925925drop - Drop your account
    926926
    927 Syntax: 
     927Syntax: 
    928928
    929929drop <password>
     
    935935blist - List all the buddies in your contact list
    936936
    937 Syntax: 
     937Syntax: 
    938938
    939939blist [all|online|offline|away]
     
    944944nick - Change friendly name, nick
    945945
    946 Syntax: 
     946Syntax: 
    947947
    948948nick <connection> [<new nick>]
     
    960960upgrading)
    961961
    962 Syntax: 
     962Syntax: 
    963963
    964964import_buddies <connection> [clear]
     
    982982command again.
    983983
    984 Chapter 6. Misc Stuff
     984Chapter 6. Misc Stuff
    985985
    986986Table of Contents
  • help.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • ini.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • irc.c

    rf7f3ada rb135438  
    162162        if( irc->w_watch_source_id > 0 )
    163163                g_source_remove( irc->w_watch_source_id );
    164         g_io_channel_close( irc->io_channel );
     164       
    165165        g_io_channel_unref( irc->io_channel );
    166166        irc_connection_list = g_slist_remove( irc_connection_list, irc );
     
    462462                }
    463463                return( 1 );
     464        }
     465        else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
     466        {
     467                irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
     468                g_io_channel_close( irc->io_channel );
     469                return( 0 );
    464470        }
    465471       
     
    637643                }
    638644        }
    639         else if( g_strcasecmp( cmd[0], "QUIT" ) == 0 )
    640         {
    641                 irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
    642                 g_io_channel_close( irc->io_channel );
    643                 return( 0 );
    644         }
    645645        else if( g_strcasecmp( cmd[0], "WHO" ) == 0 )
    646646        {
  • log.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • log.h

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • protocols/msn/sb.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • protocols/nogaim.c

    rf7f3ada rb135438  
    468468void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
    469469{
    470         irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->username, title, msg );
     470        irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->prpl->name, gc->username, msg );
    471471}
    472472
  • protocols/oscar/aim_internal.h

    rf7f3ada rb135438  
    107107
    108108void aim_initsnachash(aim_session_t *sess);
    109 aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac);
    110109aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
    111110aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id);
  • protocols/oscar/snac.c

    rf7f3ada rb135438  
    1414
    1515#include <aim.h>
     16
     17static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac);
    1618
    1719/*
     
    5153 * list/hash.
    5254 */
    53 aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
     55static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac)
    5456{
    5557        aim_snac_t *snac;
  • protocols/proxy.c

    rf7f3ada rb135438  
    9797}
    9898
    99 #ifdef PROXYPROFILER
    100 struct proxyprofiler
    101 {
    102         GaimInputFunction function;
    103         gpointer data;
    104        
    105         int count;
    106        
    107         struct proxyprofiler *next;
    108 } *pp = NULL;
    109 
    110 void proxyprofiler_dump()
    111 {
    112         struct proxyprofiler *l;
    113         char s[128];
    114         FILE *fp;
    115        
    116         sprintf( s, "proxyprofiler.%d", (int) getpid() );
    117         fp = fopen( s, "w" );
    118        
    119         fprintf( fp, "%-18s  %-18s  %10s\n", "Function", "Data", "Count" );
    120         for( l = pp; l; l = l->next )
    121                 fprintf( fp, "0x%-16x  0x%-16x  %10d\n", (int) l->function, (int) l->data, l->count );
    122        
    123         fclose( fp );
    124 }
    125 #endif
    126 
    12799static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
    128100{
     
    130102        GaimInputCondition gaim_cond = 0;
    131103
    132 #ifdef PROXYPROFILER
    133         struct proxyprofiler *l;
    134        
    135         for( l = pp; l; l = l->next )
    136         {
    137                 if( closure->function == l->function && closure->data == l->data )
    138                         break;
    139         }
    140         if( l )
    141         {
    142                 l->count ++;
    143         }
    144         else
    145         {
    146                 l = g_new0( struct proxyprofiler, 1 );
    147                 l->function = closure->function;
    148                 l->data = closure->data;
    149                 l->count = 1;
    150                
    151                 l->next = pp;
    152                 pp = l;
    153         }
    154 #endif
    155        
    156         count_io_event(source, "proxy");
    157        
    158104        if (condition & GAIM_READ_COND)
    159105                gaim_cond |= GAIM_INPUT_READ;
  • protocols/ssl_nss.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
    77/* SSL module - NSS version                                             */
    88
    9 /* Copyright 2004 Jelmer Vernooij                                       */
     9/* Copyright 2005 Jelmer Vernooij                                       */
    1010
    1111/*
  • set.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
  • unix.c

    rf7f3ada rb135438  
    3636
    3737static void sighandler( int signal );
    38 gboolean bitlbee_dirty_workaround( gpointer data );
    3938
    4039int main( int argc, char *argv[] )
     
    9695                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
    9796       
    98         /* Workaround against runaway problems. Bah, this is really dirty,
    99            but in the end not really different from the <=0.91 situation,
    100            which makes it an acceptable temporary "solution". */
    101         // g_timeout_add( 0, bitlbee_dirty_workaround, NULL );
    102        
    10397        g_main_run( global.loop );
    10498       
    10599        return( 0 );
    106100}
    107 
    108 gboolean bitlbee_dirty_workaround( gpointer data )
    109 {
    110         usleep( 50000 );
    111         return( TRUE );
    112 }
    113 
    114 void proxyprofiler_dump();
    115101
    116102static void sighandler( int signal )
     
    142128                }
    143129        }
    144 #ifdef PROXYPROFILER
    145         else if( signal == SIGXCPU )
    146         {
    147                 write_io_activity();
    148                 proxyprofiler_dump();
    149                 log_message( LOGLVL_ERROR, "Received SIGXCPU, dumping some debugging info." );
    150                 exit( 1 );
    151         }
    152 #endif
    153130        else if( signal != SIGPIPE )
    154131        {
Note: See TracChangeset for help on using the changeset viewer.