Changeset b79308b for account.c

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• account.c (modified) (2 diffs)

account.c

@@ -182 +182 @@
         account_t *a, *l = NULL;
         
+        if( acc->ic )
+                /* Caller should have checked, accounts still in use can't be deleted. */
+                return;
+        
         for( a = irc->accounts; a; a = (l=a)->next )
                 if( a == acc )
                 {
-                        if( a->ic ) return; /* Caller should have checked, accounts still in use can't be deleted. */
-                        
                         if( l )
-                        {
                                 l->next = a->next;
-                        }
                         else
-                        {
                                 irc->accounts = a->next;
-                        }
                         
                         while( a->set )
@@ -203 +201 @@
                         g_free( a->user );
                         g_free( a->pass );
-                        if( a->server ) g_free( a->server );
+                        g_free( a->server );
                         if( a->reconnect )      /* This prevents any reconnect still queued to happen */
                                 cancel_auto_reconnect( a );