Changeset 983bb66

Timestamp:

2011-05-01T16:32:11Z (14 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:

• doc/user-guide/commands.xml (modified) (2 diffs)
• otr.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -393 +393 @@
 
                         <para>
-                                Available subcommands: connect, disconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
+                                Available subcommands: connect, disconnect, reconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
                         </para>
 
@@ -418 +418 @@
                                 <para>
                                         Resets the connection with the specified user to cleartext.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="reconnect">
+                        <syntax>otr reconnect &lt;nick&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Breaks and re-establishes the encrypted connection with the specified user. Useful if something got desynced.
+                                </para>
+                                
+                                <para>
+                                        Equivalent to <emphasis>otr disconnect</emphasis> followed by <emphasis>otr connect</emphasis>.
                                 </para>
                                 

otr.c

@@ -86 +86 @@
 void cmd_otr_connect(irc_t *irc, char **args);
 void cmd_otr_disconnect(irc_t *irc, char **args);
+void cmd_otr_reconnect(irc_t *irc, char **args);
 void cmd_otr_smp(irc_t *irc, char **args);
 void cmd_otr_smpq(irc_t *irc, char **args);
@@ -96 +97 @@
         { "connect",     1, &cmd_otr_connect,    0 },
         { "disconnect",  1, &cmd_otr_disconnect, 0 },
+        { "reconnect",   1, &cmd_otr_reconnect,  0 },
         { "smp",         2, &cmd_otr_smp,        0 },
         { "smpq",        3, &cmd_otr_smpq,       0 },
@@ -693 +695 @@
 
 /*** OTR sub-command handlers ***/
+
+void cmd_otr_reconnect(irc_t *irc, char **args)
+{
+        cmd_otr_disconnect(irc, args);
+        cmd_otr_connect(irc, args);
+}
 
 void cmd_otr_disconnect(irc_t *irc, char **args)