Changes in root_commands.c [3064ea4:23c4e64]

File:

• root_commands.c (modified) (11 diffs)

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
-#include "otr.h"
 
 #include <string.h>
@@ -205 +204 @@
 }
 
+struct cmd_account_del_data
+{
+        account_t *a;
+        irc_t *irc;
+};
+
+void cmd_account_del_yes( void *data )
+{
+        struct cmd_account_del_data *cad = data;
+        account_t *a;
+        
+        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
+        
+        if( a == NULL )
+        {
+                irc_usermsg( cad->irc, "Account already deleted" );
+        }
+        else if( a->ic )
+        {
+                irc_usermsg( cad->irc, "Account is still logged in, can't delete" );
+        }
+        else
+        {
+                account_del( cad->irc, a );
+                irc_usermsg( cad->irc, "Account deleted" );
+        }
+        g_free( data );
+}
+
+void cmd_account_del_no( void *data )
+{
+        g_free( data );
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -242 +275 @@
                 
                 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 )
@@ -263 +292 @@
                 else
                 {
-                        account_del( irc, a );
-                        irc_usermsg( irc, "Account deleted" );
+                        struct cmd_account_del_data *cad;
+                        char *msg;
+                        
+                        cad = g_malloc( sizeof( struct cmd_account_del_data ) );
+                        cad->a = a;
+                        cad->irc = irc;
+                        
+                        msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will "
+                                               "also forget all your saved nicknames. If you want "
+                                               "to change your username/password, use the `account "
+                                               "set' command. Are you sure you want to delete this "
+                                               "account?", a->prpl->name, a->user );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
+                        g_free( msg );
                 }
         }
@@ -382 +423 @@
                         acc_handle = g_strdup( cmd[2] );
                 
+                if( !acc_handle )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 3 );
+                        return;
+                }
+                
                 if( ( tmp = strchr( acc_handle, '/' ) ) )
                 {
@@ -454 +501 @@
         {
                 add_on_server = 0;
-                cmd ++;         /* So evil... :-D */
+                cmd ++;
         }
         
@@ -486 +533 @@
         }
         
-        /* 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]  );
@@ -561 +609 @@
                         g_free( irc->mynick );
                         irc->mynick = g_strdup( cmd[2] );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "root_nick", cmd[2] );
                 }
                 else if( u->send_handler == buddy_send_handler )
@@ -569 +620 @@
                 irc_usermsg( irc, "Nick successfully changed" );
         }
+}
+
+char *set_eval_root_nick( set_t *set, char *new_nick )
+{
+        irc_t *irc = set->data;
+        
+        if( strcmp( irc->mynick, new_nick ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL };
+                
+                cmd_rename( irc, cmd );
+        }
+        
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
 }
 
@@ -773 +838 @@
                 else
                         irc_usermsg( irc, "%s is empty", set_name );
+
+                if( strchr( set_name, '/' ) )
+                        irc_usermsg( irc, "Warning: / found in setting name, you're probably looking for the `account set' command." );
         }
         else
@@ -996 +1064 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
-        { "otr",            1, cmd_otr,            0 }, 
         { NULL }
 };