Changeset c4a1036 for root_commands.c

Timestamp:

2008-06-09T01:52:28Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

12ebe74

Parents:

e46e077 (diff), 783e9b7 (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 integration branch.

File:

• root_commands.c (modified) (6 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 )
-{
+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 );
 }
 
@@ -278 +292 @@
                 else
                 {
+                        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 "
@@ -285 +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, a );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -404 +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, '/' ) ) )
                 {
@@ -584 +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 )
@@ -592 +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;
 }