Changeset d191f45

Timestamp:

Jun 25, 2011, 3:26:15 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

7ed9bc6

Parents:

e4d7cb6

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 11:10:36)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:15)

Message:

Make owl_buddylist use a GPtrArray directly

Files:

• buddylist.c (modified) (7 diffs)
• owl.h (modified) (1 diff)

buddylist.c

@@ -3 +3 @@
 void owl_buddylist_init(owl_buddylist *bl)
 {
-  owl_list_create(&(bl->buddies));
+  bl->buddies = g_ptr_array_new();
 }
 
@@ -14 +14 @@
   
   owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
-  owl_list_append_element(&(bl->buddies), b);
+  g_ptr_array_add(bl->buddies, b);
 }
 
@@ -21 +21 @@
 int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, const char *name)
 {
-  int i, j;
+  int i;
   owl_buddy *b;
 
-  j=owl_list_get_size(&(bl->buddies));
-  for (i=0; i<j; i++) {
-    b=owl_list_get_element(&(bl->buddies), i);
+  for (i = 0; i < bl->buddies->len; i++) {
+    b = bl->buddies->pdata[i];
     if (!strcasecmp(name, owl_buddy_get_name(b)) && owl_buddy_is_proto_aim(b)) {
-      owl_list_remove_element(&(bl->buddies), i);
-      owl_buddy_delete(b);
+      owl_buddy_delete(g_ptr_array_remove_index(bl->buddies, i));
       return(0);
     }
@@ -87 +85 @@
 int owl_buddylist_get_size(const owl_buddylist *bl)
 {
-  return(owl_list_get_size(&(bl->buddies)));
+  return bl->buddies->len;
 }
 
@@ -97 +95 @@
   if (index>(owl_buddylist_get_size(bl)-1)) return(NULL);
 
-  return(owl_list_get_element(&(bl->buddies), index));
+  return bl->buddies->pdata[index];
 }
 
@@ -105 +103 @@
 owl_buddy *owl_buddylist_get_aim_buddy(const owl_buddylist *bl, const char *name)
 {
-  int i, j;
+  int i;
   owl_buddy *b;
 
-  j=owl_list_get_size(&(bl->buddies));
-  for (i=0; i<j; i++) {
-    b=owl_list_get_element(&(bl->buddies), i);
+  for (i = 0; i < bl->buddies->len; i++) {
+    b = bl->buddies->pdata[i];
     if (!strcasecmp(name, owl_buddy_get_name(b))) return(b);
   }
@@ -131 +128 @@
 void owl_buddylist_clear(owl_buddylist *bl)
 {
-  owl_list_cleanup(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
-  owl_list_create(&(bl->buddies));
+  g_ptr_array_foreach(bl->buddies, (GFunc)owl_buddy_delete, NULL);
+  g_ptr_array_set_size(bl->buddies, 0);
 }
 
 void owl_buddylist_cleanup(owl_buddylist *bl)
 {
-  owl_list_cleanup(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
+  g_ptr_array_foreach(bl->buddies, (GFunc)owl_buddy_delete, NULL);
+  g_ptr_array_free(bl->buddies, true);
 }

owl.h

@@ -508 +508 @@
 
 typedef struct _owl_buddylist {
-  owl_list buddies;
+  GPtrArray *buddies;
 } owl_buddylist;