Changeset f4d0975 for buddylist.c

Timestamp:

Oct 10, 2003, 5:12:19 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e374dee

Parents:

12582d3

Message:

Fixed bug with idle times causing broken pipes.
New libfaim

File:

• buddylist.c (modified) (5 diffs)

buddylist.c

@@ -3 +3 @@
 static const char fileIdent[] = "$Id$";
 
-void owl_buddylist_init(owl_buddylist *b)
+void owl_buddylist_init(owl_buddylist *bl)
 {
-  owl_list_create(&(b->buddies));
-  owl_list_create(&(b->idletimes));
-  /* owl_list_create(&(g->buddymsg_queue)); */
+  owl_list_create(&(bl->buddies));
+}
+
+/* add a (logged-in) AIM buddy to the buddy list
+ */
+void owl_buddylist_add_aim_buddy(owl_buddylist *bl, char *screenname)
+{
+  owl_buddy *b;
+  b=owl_malloc(sizeof(owl_buddy));
+  
+  owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
+  owl_list_append_element(&(bl->buddies), b);
+}
+
+/* remove an AIM buddy from the buddy list
+ */
+int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, char *name)
+{
+  int i, j;
+  owl_buddy *b;
+
+  j=owl_list_get_size(&(bl->buddies));
+  for (i=0; i<j; i++) {
+    b=owl_list_get_element(&(bl->buddies), i);
+    if (!strcasecmp(name, owl_buddy_get_name(b)) && owl_buddy_is_proto_aim(b)) {
+      owl_list_remove_element(&(bl->buddies), i);
+      owl_buddy_free(b);
+      return(0);
+    }
+  }
+  return(1);
 }
 
@@ -14 +42 @@
  * logged in.
  */
-void owl_buddylist_oncoming(owl_buddylist *b, char *screenname)
+void owl_buddylist_oncoming(owl_buddylist *bl, char *screenname)
 {
-  int *zero;
   owl_message *m;
 
-  if (!owl_buddylist_is_buddy_loggedin(b, screenname)) {
+  if (!owl_buddylist_is_aim_buddy_loggedin(bl, screenname)) {
 
-    /* add the buddy */
-    owl_list_append_element(&(b->buddies), owl_strdup(screenname));
-    zero=owl_malloc(sizeof(int));
-    *zero=0;
-    owl_list_append_element(&(b->idletimes), zero);
+    owl_buddylist_add_aim_buddy(bl, screenname);
 
-    /* do a request for idle time */
-    owl_buddylist_request_idletime(b, screenname);
-        
     /* are we ingoring login messages for a while? */
     if (!owl_timer_is_expired(owl_global_get_aim_login_timer(&g))) return;
@@ -48 +68 @@
  * has logged out, and sending a message if they were logged in.
  */
-void owl_buddylist_offgoing(owl_buddylist *b, char *screenname)
+void owl_buddylist_offgoing(owl_buddylist *bl, char *screenname)
 {
-  int index;
   owl_message *m;
 
-  index=owl_buddylist_get_buddy_index(b, screenname);
-  if (index==-1) return;
-
-  owl_free(owl_list_get_element(&(b->buddies), index));
-  owl_free(owl_list_get_element(&(b->idletimes), index));
-  owl_list_remove_element(&(b->buddies), index);
-  owl_list_remove_element(&(b->idletimes), index);
-
+  owl_buddylist_remove_aim_buddy(bl, screenname);
+  
   m=owl_malloc(sizeof(owl_message));
   owl_message_create_aim(m,
@@ -71 +84 @@
 }
 
-/* send requests to the AIM server to retrieve info
- * on all buddies.  The AIM callback then fills in the
- * values when the responses are received
+/* return the number of logged in buddies */
+int owl_buddylist_get_size(owl_buddylist *bl)
+{
+  return(owl_list_get_size(&(bl->buddies)));
+}
+
+/* return the buddy with index N.  If out of range, return NULL
  */
-void owl_buddylist_request_idletimes(owl_buddylist *b)
+owl_buddy *owl_buddylist_get_buddy_n(owl_buddylist *bl, int index)
+{
+  if (index<0) return(NULL);
+  if (index>(owl_buddylist_get_size(bl)-1)) return(NULL);
+
+  return(owl_list_get_element(&(bl->buddies), index));
+}
+
+/* return the AIM buddy with screenname 'name'.  If
+ * no such buddy is logged in, return NULL.
+ */
+owl_buddy *owl_buddylist_get_aim_buddy(owl_buddylist *bl, char *name)
 {
   int i, j;
+  owl_buddy *b;
 
-  j=owl_buddylist_get_size(b);
+  j=owl_list_get_size(&(bl->buddies));
   for (i=0; i<j; i++) {
-    owl_aim_get_idle(owl_buddylist_get_buddy(b, i));
+    b=owl_list_get_element(&(bl->buddies), i);
+    if (!strcasecmp(name, owl_buddy_get_name(b))) return(b);
   }
-}
-
-/* send request to the AIM server to retrieve info on one buddy.  The
- * AIM callback then fills in the values when the responses are
- * received.  The buddy must be logged in or no request will be
- * performed.
- */
-void owl_buddylist_request_idletime(owl_buddylist *b, char *screenname)
-{
-  if (!owl_buddylist_is_buddy_loggedin(b, screenname)) return;
-  
-  owl_aim_get_idle(screenname);
-}
-
-/* return the number of logged in buddies */
-int owl_buddylist_get_size(owl_buddylist *b)
-{
-  return(owl_list_get_size(&(b->buddies)));
-}
-
-/* get buddy number 'n' */
-char *owl_buddylist_get_buddy(owl_buddylist *b, int n)
-{
-  if (n > owl_buddylist_get_size(b)-1) return("");
-  return(owl_list_get_element(&(b->buddies), n));
-}
-
-/* Return the index of the buddy 'screename' or -1
- * if the buddy is not logged in.
- */
-int owl_buddylist_get_buddy_index(owl_buddylist *b, char *screenname)
-{
-  int i, j;
-  
-  j=owl_list_get_size(&(b->buddies));
-  for (i=0; i<j; i++) {
-    if (!strcasecmp(owl_list_get_element(&(b->buddies), i), screenname)) {
-      return(i);
-    }
-  }
-  return(-1);
+  return(NULL);
 }
 
@@ -129 +119 @@
  * otherwise return 0
  */
-int owl_buddylist_is_buddy_loggedin(owl_buddylist *b, char *screenname)
+int owl_buddylist_is_aim_buddy_loggedin(owl_buddylist *bl, char *screenname)
 {
-  if (owl_buddylist_get_buddy_index(b, screenname)!=-1) return(1);
-  return(0);
-}
+  owl_buddy *b;
 
-/* get the idle time for buddy number 'n' */
-int owl_buddylist_get_idletime(owl_buddylist *b, int n)
-{
-  int *foo;
-
-  foo=owl_list_get_element(&(b->idletimes), n);
-  return(*foo);
-}
-
-/* Set the idle time for user 'screenname'.  If the given screenname
- * is not on the buddy list do nothing.  If there is a queued request
- * for this screename, remove it from the queue.
- */
-void owl_buddylist_set_idletime(owl_buddylist *b, char *screenname, int minutes)
-{
-  int index, *idle;
-
-  index=owl_buddylist_get_buddy_index(b, screenname);
-  if (index==-1) return;
-
-  owl_free(owl_list_get_element(&(b->idletimes), index));
-  idle=owl_malloc(sizeof(int));
-  *idle=minutes;
-  owl_list_replace_element(&(b->idletimes), index, idle);
+  b=owl_buddylist_get_aim_buddy(bl, screenname);
+  if (b==NULL) return(0);
+  return(1);
 }
 
 /* remove all buddies from the list */
-void owl_buddylist_clear(owl_buddylist *b) {
-  owl_list_free_all(&(b->buddies), owl_free);
-  owl_list_free_all(&(b->idletimes), owl_free);
-  owl_list_create(&(b->buddies));
-  owl_list_create(&(b->idletimes));
+void owl_buddylist_clear(owl_buddylist *bl)
+{
+  owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
+  owl_list_create(&(bl->buddies));
 }
+
+void owl_buddylist_free(owl_buddylist *bl)
+{
+  owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
+}