changeset 817:aefd5f2b1ea0

[gaim-migrate @ 827] gaim depends on libfaim committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 01 Sep 2000 00:03:58 +0000
parents 09e9685e24b9
children f425f51a3db8
files libfaim/CHANGES libfaim/README.gaim libfaim/aim_conn.c src/Makefile.am
diffstat 4 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libfaim/CHANGES	Thu Aug 31 23:04:07 2000 +0000
+++ b/libfaim/CHANGES	Fri Sep 01 00:03:58 2000 +0000
@@ -1,6 +1,10 @@
 
 No release numbers
 ------------------
+ - Thu Aug 31 23:40:23 UTC 2000
+   - Threw in aim_select modification from nicolas
+   - Remove stray debugging printf in aim_tlv
+
  - Mon Aug 28 03:11:15 GMT 2000
    - Adds lots of comments
    - Add AIM_CLASS_ALLUSERS constant for setgrouppermmask()
--- a/libfaim/README.gaim	Thu Aug 31 23:04:07 2000 +0000
+++ b/libfaim/README.gaim	Fri Sep 01 00:03:58 2000 +0000
@@ -14,7 +14,6 @@
 So far the changes to libfaim that I've made are:
 - remove mkbuildinfo.sh and put the #defines it creates into Makefile.am
 - add #if HAVE_GETADDRINFO in aim_ft.c for Solaris people
-- aim_tlv.c: deleted a printf
 - aim_snac.c: in aim_remsnac, default cur to NULL, to avoid segfault
 
 And finally, a word of warning. Gaim/Faim is VERY buggy. Please, don't use this
--- a/libfaim/aim_conn.c	Thu Aug 31 23:04:07 2000 +0000
+++ b/libfaim/aim_conn.c	Fri Sep 01 00:03:58 2000 +0000
@@ -323,10 +323,13 @@
 	return cur;
       }
     }
-  }
+    *status = 0; /* shouldn't happen */
+  } else if ((i == -1) && (errno == EINTR)) /* treat interrupts as a timeout */
+    *status = 0;
+  else
+    *status = i; /* can be 0 or -1 */
 
   faim_mutex_unlock(&sess->connlistlock);
-  *status = i; /* may be 0 or -1 */
   return NULL;  /* no waiting or error, return */
 }
 
--- a/src/Makefile.am	Thu Aug 31 23:04:07 2000 +0000
+++ b/src/Makefile.am	Fri Sep 01 00:03:58 2000 +0000
@@ -26,6 +26,7 @@
 			ticker.c \
 			toc.c \
 			util.c
+gaim_applet_DEPENDENCIES = ../libfaim/libfaim.a
 else
 bin_PROGRAMS = gaim
 gaim_SOURCES =	about.c \
@@ -54,6 +55,7 @@
 		ticker.c \
 		toc.c \
 		util.c
+gaim_DEPENDENCIES = ../libfaim/libfaim.a
 endif
 
 CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\"