Changeset 764c7d1 for root_commands.c

Timestamp:

2008-02-03T21:30:03Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

3c80a9d

Parents:

b5c8a34

Message:

OTR support, first checkin

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "otr.h"
 
 #include <string.h>
@@ -85 +86 @@
                 return;
         
+        if(!g_mutex_trylock(irc->otr_mutex)) {
+                irc_usermsg(irc, "keygen in progress, bitlbee comatose - please wait");
+                return;
+        }
+        
         for( i = 0; commands[i].command; i++ )
                 if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
@@ -91 +97 @@
                         {
                                 irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
+                                g_mutex_unlock(irc->otr_mutex);
                                 return;
                         }
                         commands[i].execute( irc, cmd );
+                        g_mutex_unlock(irc->otr_mutex);
                         return;
                 }
         
         irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        g_mutex_unlock(irc->otr_mutex);
 }
 
@@ -241 +250 @@
                 
                 irc_usermsg( irc, "Account successfully added" );
+                
+                otr_check_for_key(a);
         }
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
@@ -991 +1002 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "otr",            1, cmd_otr,            0 }, 
         { NULL }
 };