[Ayttm-commits] CVS: ayttm/src contact_util.c,1.1,1.2

[Philip S Tellis <address@hidden>]

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

Modified Files:
        contact_util.c 
Log Message:
group rename simplified

Index: contact_util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/contact_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact_util.c      6 Feb 2003 08:43:35 -0000       1.1
+++ contact_util.c      6 Feb 2003 13:12:04 -0000       1.2
@@ -31,6 +31,7 @@
 #include "account.h"
 #include "contact.h"
 #include "service.h"
+#include "offline_queue_mgmt.h"
 
 static LList *groups = NULL;
 extern LList *accounts;
@@ -257,7 +258,7 @@
                        if (ONLINE(ela))
                                RUN_SERVICE(ela)->del_group(group->name);
                        else
-                               group_mgmt_queue_add(eal, group->name, 
MGMT_GRP_DEL, NULL);
+                               group_mgmt_queue_add(ela, group->name, 
MGMT_GRP_DEL, NULL);
                }
        }
 
@@ -302,25 +303,6 @@
                                RUN_SERVICE(ela)->rename_group(group->name, 
new_name);
                        else
                                group_mgmt_queue_add(ela, NULL, MGMT_GRP_REN, 
new_name);
-               } else {
-                       LList *l1, *l2;
-                       if(CAN(ela, add_group)) {
-                               if (ONLINE(ela))
-                                       RUN_SERVICE(ela)->add_group(new_name);
-                               else
-                                       group_mgmt_queue_add(ela, NULL, 
MGMT_GRP_ADD, new_name);
-                       }
-                       
-                       for(l1=group->members; l1; l1=l1->next)
-                               for(l2=((struct contact *)l1->data)->accounts; 
l2; l2=l2->next)
-                                       handle_group_change(l2->data, 
group->name, new_name);
-
-                       if(CAN(ela, del_group)) {
-                               if (ONLINE(ela))
-                                       
RUN_SERVICE(ela)->del_group(group->name);
-                               else
-                                       group_mgmt_queue_add(ela, group->name, 
MGMT_GRP_DEL, NULL);
-                       }
                }
        }
 
@@ -370,18 +352,20 @@
 
 LList * get_group_names( void )
 {
-       LList * g, g2;
+       LList * g, *g2;
        for(g2 = groups; g2; g2=g2->next)
-               g = l_list_insert_sorted(g, ((grouplist *)g2->data)->name, 
strcasecmp);
+               g = l_list_insert_sorted(g, ((grouplist *)g2->data)->name, 
+                               (LListCompFunc)strcasecmp);
 
        return g;
 }
 
 LList * get_group_contact_names( grouplist * group )
 {
-       LList * g, g2;
+       LList * g, *g2;
        for(g2 = group->members; g2; g2=g2->next)
-               g = l_list_insert_sorted(g, ((struct contact *)g2->data)->nick, 
strcasecmp);
+               g = l_list_insert_sorted(g, ((struct contact *)g2->data)->nick,
+                               (LListCompFunc)strcasecmp);
 
        return g;
 }