Changeset f35aee7 for root_commands.c

Timestamp:

2008-04-05T12:36:13Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1195cec

Parents:

9143aeb

Message:

Fixed #386.

File:

• root_commands.c (modified) (3 diffs)

root_commands.c

@@ -204 +204 @@
 }
 
-void cmd_account_del_yes( gpointer w, void *data )
-{
-        account_t **aptr = data;
-        irc_t *irc = (*aptr)->irc;
-        
-        if( (*aptr)->ic )
-        {
-                irc_usermsg( irc, "Account is still logged in, can't delete" );
-        }
-        else
-        {
-                account_del( irc, (*aptr) );
-                irc_usermsg( irc, "Account deleted" );
-        }
-        g_free( aptr );
-}
-
-void cmd_account_del_no( gpointer w, void *data )
+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 );
@@ -280 +292 @@
                 else
                 {
-                        account_t **aptr;
+                        struct cmd_account_del_data *cad;
                         char *msg;
                         
-                        aptr = g_malloc( sizeof( aptr ) );
-                        *aptr = a;
+                        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 "
@@ -291 +304 @@
                                                "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, aptr );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }