Changeset dd34575 for root_commands.c

Timestamp:

2008-04-02T13:28:23Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

6ff51ff, 85d7b85

Parents:

0db75ad (diff), fa75134 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge trunk.

File:

• root_commands.c (modified) (3 diffs)

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 );
                 }
         }
@@ -769 +796 @@
                 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