Changeset 7f421d6

Timestamp:

2008-03-03T23:18:36Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9ad86bb

Parents:

ed3ae7e

Message:

BitlBee <= 1.0 didn't have "account set" and allowed one to delete an account
and re-create it with new login settings if necessary, without losing custom
nicknames. Now, nicknames are connected to an account instead of just the
protocol, and they're flushed together with the account. So I added a warning
to make sure nobody accidentally loses any settings while just changing the
password. This will probably go after a few releases, since it's slightly
annoying.

Files:

• query.c (modified) (1 diff)
• root_commands.c (modified) (2 diffs)

query.c

@@ -140 +140 @@
         if( ans )
         {
-                imcb_log( q->ic, "Accepted: %s", q->question );
+                if( q->ic )
+                        imcb_log( q->ic, "Accepted: %s", q->question );
+                else
+                        irc_usermsg( irc, "Accepted: %s", q->question );
                 q->yes( NULL, q->data );
         }
         else
         {
-                imcb_log( q->ic, "Rejected: %s", q->question );
+                if( q->ic )
+                        imcb_log( q->ic, "Rejected: %s", q->question );
+                else
+                        irc_usermsg( irc, "Rejected: %s", q->question );
                 q->no( NULL, q->data );
         }

root_commands.c

@@ -204 +204 @@
 }
 
+void cmd_account_del_yes( gpointer w, void *data )
+{
+        account_t *a = data;
+        irc_t *irc = a->irc;
+        
+        if( a->ic )
+        {
+                irc_usermsg( irc, "Account is still logged in, can't delete" );
+        }
+        else
+        {
+                account_del( irc, a );
+                irc_usermsg( irc, "Account deleted" );
+        }
+}
+
+void cmd_account_del_no( gpointer w, void *data )
+{
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -258 +278 @@
                 else
                 {
-                        account_del( irc, a );
-                        irc_usermsg( irc, "Account deleted" );
+                        char *msg;
+                        
+                        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, a );
+                        g_free( msg );
                 }
         }