[Ayttm-commits] CVS: ayttm/src util.c,1.40,1.41

[Philip S Tellis <address@hidden>]

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

Modified Files:
        util.c 
Log Message:
rename contact merging stuff


Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- util.c      3 Feb 2003 09:40:15 -0000       1.40
+++ util.c      5 Feb 2003 07:32:53 -0000       1.41
@@ -1130,6 +1130,9 @@
        struct contact *con;
        LList *l = c->accounts;
        
+       if(!strcasecmp(g->name, group))
+               return;
+
        g->members = l_list_remove(g->members, c);
        remove_contact_line(c);
        g = find_grouplist_by_name(group);
@@ -1147,15 +1150,17 @@
                handle_group_change(ea, c->group->name, group);
        }
 
-       con = find_contact_by_nick(c->nick);
+       con = find_contact_in_group_by_nick(c->nick, g);
        if(con) {
-               rename_nick_log(group, c->nick, group, con->nick);
+               return; /* group same and contact same.  what move? */
+               
+/*             rename_nick_log(group, c->nick, group, con->nick);
                for(l=c->accounts; l; l=l->next) {
                        eb_account *ea = l->data;
 
                        ea->account_contact = con;
                        con->accounts = l_list_append(con->accounts, ea);
-                       if (RUN_SERVICE(ea)->change_user_name) {
+                       if(RUN_SERVICE(ea)->change_user_name) {
                                if (!find_suitable_local_account(NULL, 
ea->service_id))
                                        contact_mgmt_queue_add(ea, MGMT_REN, 
con->nick);
                                else
@@ -1164,7 +1169,7 @@
                }
                l_list_free(c->accounts);
                add_contact_and_accounts(con);
-               add_contact_line(con);
+               add_contact_line(con);*/
        } else {
                g->members = l_list_insert_sorted(g->members, c, contact_cmp);
                c->group = g;