Changeset 983bb66


Ignore:
Timestamp:
2011-05-01T16:32:11Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
2370ec2, b194fe7
Parents:
6963230 (diff), 69ef042 (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 "otr reconnect", bug #740.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    r6963230 r983bb66  
    393393
    394394                        <para>
    395                                 Available subcommands: connect, disconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
     395                                Available subcommands: connect, disconnect, reconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
    396396                        </para>
    397397
     
    418418                                <para>
    419419                                        Resets the connection with the specified user to cleartext.
     420                                </para>
     421                               
     422                        </description>
     423               
     424                </bitlbee-command>
     425               
     426                <bitlbee-command name="reconnect">
     427                        <syntax>otr reconnect &lt;nick&gt;</syntax>
     428                       
     429                        <description>
     430                       
     431                                <para>
     432                                        Breaks and re-establishes the encrypted connection with the specified user. Useful if something got desynced.
     433                                </para>
     434                               
     435                                <para>
     436                                        Equivalent to <emphasis>otr disconnect</emphasis> followed by <emphasis>otr connect</emphasis>.
    420437                                </para>
    421438                               
  • otr.c

    r6963230 r983bb66  
    8686void cmd_otr_connect(irc_t *irc, char **args);
    8787void cmd_otr_disconnect(irc_t *irc, char **args);
     88void cmd_otr_reconnect(irc_t *irc, char **args);
    8889void cmd_otr_smp(irc_t *irc, char **args);
    8990void cmd_otr_smpq(irc_t *irc, char **args);
     
    9697        { "connect",     1, &cmd_otr_connect,    0 },
    9798        { "disconnect",  1, &cmd_otr_disconnect, 0 },
     99        { "reconnect",   1, &cmd_otr_reconnect,  0 },
    98100        { "smp",         2, &cmd_otr_smp,        0 },
    99101        { "smpq",        3, &cmd_otr_smpq,       0 },
     
    693695
    694696/*** OTR sub-command handlers ***/
     697
     698void cmd_otr_reconnect(irc_t *irc, char **args)
     699{
     700        cmd_otr_disconnect(irc, args);
     701        cmd_otr_connect(irc, args);
     702}
    695703
    696704void cmd_otr_disconnect(irc_t *irc, char **args)
Note: See TracChangeset for help on using the changeset viewer.