[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.17,1.18 plugin_api.c,1.10,1.11 util.c,1.36,1.37

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv4311/src

Modified Files:
        add_contact_window.c plugin_api.c util.c 
Log Message:
fixes to move account if exists and stuff that followed from there

Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- add_contact_window.c        24 Jan 2003 20:41:31 -0000      1.17
+++ add_contact_window.c        31 Jan 2003 07:29:19 -0000      1.18
@@ -208,10 +208,8 @@
        }  
        
        add_account(con->nick, ea);
-       if (l_list_length(con->accounts) == 0)
-               remove_contact(con);
-       update_contact_list ();
-       write_contact_list();
+/*     update_contact_list ();
+       write_contact_list(); */
        gtk_widget_destroy(add_contact_window);
 }
 

Index: plugin_api.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin_api.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin_api.c        29 Jan 2003 19:19:23 -0000      1.10
+++ plugin_api.c        31 Jan 2003 07:29:19 -0000      1.11
@@ -36,7 +36,7 @@
 
        result=(int)gtk_object_get_user_data(GTK_OBJECT(widget));
        cd->action(cd->data, result);
-       //g_free(cd);
+       free(cd);
 }
 
 /* End local structures and functions */

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- util.c      29 Jan 2003 19:19:23 -0000      1.36
+++ util.c      31 Jan 2003 07:29:19 -0000      1.37
@@ -949,17 +949,17 @@
 
        if(result)
                move_account(rad->contact, rad->account);
+       else if (l_list_length(rad->contact->accounts) == 0)
+               remove_contact(rad->contact);
 
        free(rad);
 }
 
 static void add_account_verbose( char * contact, eb_account * account, int 
verbosity )
 {
+       struct relocate_account_data * rad; 
        struct contact * c = find_contact_by_nick( contact );
        eb_account * ea = find_account_by_handle(account->handle, 
account->service_id);
-       if (!find_suitable_local_account(NULL, account->service_id)) {
-               contact_mgmt_queue_add(account, MGMT_ADD, 
c?c->group->name:_("Unknown"));
-       }
        if(ea) {
                if(!strcasecmp(ea->account_contact->group->name, _("Unknown"))) 
{
                        move_account(c, ea);
@@ -968,16 +968,15 @@
                        snprintf(buff, sizeof(buff), 
                                        _("The account already exists on your\n"
                                        "contact list at the following 
location\n"
-                                       "Group: %s\n"
-                                       "Contact: %s\n"
-                                       "Should I move it?"),
+                                       "\tGroup: %s\n"
+                                       "\tContact: %s\n"
+                                       "\nShould I move it?"),
                                        ea->account_contact->group->name, 
ea->account_contact->nick );
 
                        /* remove this contact if it was newly created */
                        if(verbosity) {
-                               struct relocate_account_data * rad = 
-                                       calloc(1, sizeof(struct 
relocate_account_data));
-                               rad->account = account;
+                               rad = calloc(1, sizeof(struct 
relocate_account_data));
+                               rad->account = ea;
                                rad->contact = c;
                                eb_do_dialog(buff, _("Error: account exists"), 
move_account_yn, rad);
                        } else if( c && l_list_length(c->accounts) == 0)
@@ -985,6 +984,9 @@
                }
                return;
        }
+       if (!find_suitable_local_account(NULL, account->service_id)) {
+               contact_mgmt_queue_add(account, MGMT_ADD, 
c?c->group->name:_("Unknown"));
+       }
        if (c) {
                c->accounts = l_list_append( c->accounts, account );
                account->account_contact = c;
@@ -996,6 +998,9 @@
        }
        else 
                add_unknown_with_name(account, contact);
+
+       update_contact_list();
+       write_contact_list();
 }
 
 void add_account_silent ( char * contact, eb_account * account )
@@ -1115,6 +1120,8 @@
        }
 
        add_contact_and_accounts(con);
+
+       write_contact_list();
 }
 
 void move_contact (char * group, struct contact * c)