Changes in root_commands.c [3183c21:f536a99]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -131 +131 @@
 static void cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = storage_load( irc, cmd[1] );
+        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
         char *account_on[] = { "account", "on", NULL };
         
@@ -143 +143 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
-                irc_setpass( irc, cmd[1] );
-                irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
                 if( set_getbool( &irc->set, "auto_connect" ) )
@@ -164 +162 @@
         }
 
-        switch( storage_save( irc, cmd[1], FALSE ) ) {
+        irc_setpass( irc, cmd[1] );
+        switch( storage_save( irc, FALSE )) {
                 case STORAGE_ALREADY_EXISTS:
                         irc_usermsg( irc, "Nick is already registered" );
@@ -171 +170 @@
                 case STORAGE_OK:
                         irc_usermsg( irc, "Account successfully created" );
-                        irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
@@ -889 +887 @@
 static void cmd_save( irc_t *irc, char **cmd )
 {
-        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_usermsg( irc, "Please create an account first" );
-        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
+        if( storage_save( irc, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else