Changes in root_commands.c [3064ea4:7adc657]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
-#include "otr.h"
 
 #include <string.h>
@@ -242 +241 @@
                 
                 irc_usermsg( irc, "Account successfully added" );
-                
-                if(otr_check_for_key(a)) {
-                        irc_usermsg(irc, "otr: you will be notified when it completes");
-                }
         }
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
@@ -454 +449 @@
         {
                 add_on_server = 0;
-                cmd ++;         /* So evil... :-D */
+                cmd ++;
         }
         
@@ -486 +481 @@
         }
         
-        /* By making this optional, you can talk to people without having to
-           add them to your *real* (server-side) contact list. */
         if( add_on_server )
                 a->ic->acc->prpl->add_buddy( a->ic, cmd[2], NULL );
-        
-        /* add_buddy( a->ic, NULL, cmd[2], cmd[2] ); */
+        else
+                /* Yeah, officially this is a call-*back*... So if we just
+                   called add_buddy, we'll wait for the IM server to respond
+                   before we do this. */
+                imcb_add_buddy( a->ic, cmd[2], NULL );
         
         irc_usermsg( irc, "Adding `%s' to your contact list", cmd[2]  );
@@ -996 +992 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
-        { "otr",            1, cmd_otr,            0 }, 
         { NULL }
 };